X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fmail%2Flocale%2Fmessages.po;h=d6e60da5bb624c861a3021bf57619e538a347279;hb=9a09f2592f8db9763d9f312ad94f904a9f130522;hp=d028d419262218ed369c6a53b661cd4d72c0a404;hpb=bba6839d7dff4fecf06b0ce3d1f87f48204dcd3e;p=gosa.git

diff --git a/gosa-plugins/mail/locale/messages.po b/gosa-plugins/mail/locale/messages.po
index d028d4192..d6e60da5b 100644
--- a/gosa-plugins/mail/locale/messages.po
+++ b/gosa-plugins/mail/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-27 12:51+0200\n"
+"POT-Creation-Date: 2008-08-01 16:29+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"
@@ -16,40 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/mail/main.inc:126
-msgid "User mail settings"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:1 personal/mail/class_mailAccount.inc:1172
-#: admin/groups/mail/paste_mail.tpl:1
-msgid "Mail settings"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:7 personal/mail/generic.tpl:8
-#: personal/mail/class_mailAccount.inc:932 admin/ogroups/mail/mail.tpl:10
-#: admin/groups/mail/mail.tpl:10 admin/groups/mail/paste_mail.tpl:8
-msgid "Primary address"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:13 personal/mail/generic.tpl:262
-msgid "Forward messages to"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:25 personal/mail/generic.tpl:64
-#: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-msgid "Alternative addresses"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:44 personal/mail/generic.tpl:285
-#: admin/groups/mail/mail.tpl:208 admin/groups/mail/paste_mail.tpl:42
-msgid "Add local"
-msgstr ""
-
-#: personal/mail/copypaste.tpl:55 personal/mail/generic.tpl:67
-#: admin/groups/mail/mail.tpl:105 admin/groups/mail/paste_mail.tpl:24
-msgid "List of alternative mail addresses"
-msgstr ""
-
 #: personal/mail/mail_locals.tpl:7 admin/groups/mail/mail_locals.tpl:6
 msgid "Select addresses to add"
 msgstr ""
@@ -78,34 +44,66 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:114
-#: personal/mail/sieve/class_sieveManagement.inc:242
-msgid "Parse failed"
+#: personal/mail/class_mailAccount.inc:15
+#: personal/mail/class_mailAccount.inc:291
+#: personal/mail/class_mailAccount.inc:301
+#: personal/mail/class_mailAccount.inc:304
+#: personal/mail/class_mailAccount.inc:305
+#: personal/mail/class_mailAccount.inc:308
+#: personal/mail/class_mailAccount.inc:309
+#: personal/mail/class_mailAccount.inc:929
+#: personal/mail/class_mailAccount.inc:1173
+#: personal/mail/class_mailAccount.inc:1349
+#: admin/ogroups/mail/paste_mail.tpl:4
+#: admin/ogroups/mail/class_mailogroup.inc:186
+#: admin/groups/mail/class_groupMail.inc:1248
+msgid "Mail"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:118
-#: personal/mail/sieve/class_sieveManagement.inc:246
-msgid "Parse successful"
+#: personal/mail/class_mailAccount.inc:16
+#: addons/mailqueue/class_mailqueue.inc:7
+msgid "This does something"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:156
+#: personal/mail/class_mailAccount.inc:92
+#: personal/mail/class_mailAccount.inc:211
+#: addons/mailqueue/class_mailqueue.inc:66
+#: addons/mailqueue/class_mailqueue.inc:103
+#: addons/mailqueue/class_mailqueue.inc:133
+#: addons/mailqueue/class_mailqueue.inc:195
+#: addons/mailqueue/class_mailqueue.inc:230
+#: addons/mailqueue/class_mailqueue.inc:243
+#: admin/groups/mail/class_groupMail.inc:82
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:92
 #, php-format
-msgid ""
-"The specified mail server '%s' does not exist within the GOsa configuration."
+msgid "Mail method '%s' is unknown!"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:211
+#, php-format
+msgid "No DESC tag in vacation template '%s'!"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:302
+msgid "Mail settings cannot be removed while there are delegations configured!"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:350
+#: personal/mail/class_mailAccount.inc:366
+#: personal/mail/class_mailAccount.inc:373
+#: personal/mail/class_mailAccount.inc:402
+#: personal/mail/class_mailAccount.inc:410
+#: personal/mail/class_mailAccount.inc:422
+#: personal/mail/sieve/class_My_Tree.inc:660
 #: personal/mail/sieve/class_sieveManagement.inc:201
 #: personal/mail/sieve/class_sieveManagement.inc:206
 #: personal/mail/sieve/class_sieveManagement.inc:212
 #: personal/mail/sieve/class_sieveManagement.inc:218
 #: personal/mail/sieve/class_sieveManagement.inc:429
-#: personal/mail/sieve/class_My_Tree.inc:660
-#: personal/mail/class_mailAccount.inc:348
-#: personal/mail/class_mailAccount.inc:364
-#: personal/mail/class_mailAccount.inc:371
-#: personal/mail/class_mailAccount.inc:400
-#: personal/mail/class_mailAccount.inc:408
-#: personal/mail/class_mailAccount.inc:420 addons/mailqueue/contents.tpl:58
+#: addons/mailqueue/contents.tpl:58
 #: admin/systems/services/spam/class_goSpamServer.inc:143
 #: admin/systems/services/spam/class_goSpamServer.inc:217
 #: admin/groups/mail/class_groupMail.inc:437
@@ -115,339 +113,599 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:201
-msgid "No script name specified!"
-msgstr ""
-
-#: personal/mail/sieve/class_sieveManagement.inc:206
-msgid "Please use only lowercase script names!"
-msgstr ""
-
-#: personal/mail/sieve/class_sieveManagement.inc:212
-msgid "Please use only alphabetical characters in script names!"
-msgstr ""
-
-#: personal/mail/sieve/class_sieveManagement.inc:218
-msgid "Script name already in use!"
+#: personal/mail/class_mailAccount.inc:350
+msgid "Please select an entry!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:302
-#: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/sieve/class_sieveManagement.inc:345
-#: personal/mail/sieve/class_sieveManagement.inc:349
-#: personal/mail/sieve/class_sieveManagement.inc:398
-#: personal/mail/sieve/class_sieveManagement.inc:402
-#: personal/mail/sieve/class_sieveManagement.inc:433
-#: personal/mail/sieve/class_sieveManagement.inc:519
-#: personal/mail/sieve/class_sieveManagement.inc:771
-#: personal/mail/sieve/class_sieveManagement.inc:1031
-#: personal/mail/sieve/class_sieveManagement.inc:1044
-#: personal/mail/class_mail-methods-cyrus.inc:281
-#: personal/mail/class_mail-methods-cyrus.inc:293
-#: personal/mail/class_mail-methods-cyrus.inc:364
-#: personal/mail/class_mail-methods-cyrus.inc:368
-msgid "SIEVE error"
+#: personal/mail/class_mailAccount.inc:367
+#: personal/mail/class_mailAccount.inc:403
+#: personal/mail/class_mailAccount.inc:411
+#: personal/mail/class_mailAccount.inc:422
+#: personal/mail/class_mailAccount.inc:938
+#: personal/mail/class_mailAccount.inc:942
+#: personal/mail/class_mailAccount.inc:953
+#: personal/mail/class_mailAccount.inc:1183
+#: admin/ogroups/mail/class_mailogroup.inc:86
+#: admin/ogroups/mail/class_mailogroup.inc:93
+#: admin/ogroups/mail/class_mailogroup.inc:194
+#: admin/groups/mail/class_groupMail.inc:472
+#: admin/groups/mail/class_groupMail.inc:1045
+#: admin/groups/mail/class_groupMail.inc:1048
+#: admin/groups/mail/class_groupMail.inc:1054
+#: admin/groups/mail/class_groupMail.inc:1256
+msgid "Mail address"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:302
-#: personal/mail/sieve/class_sieveManagement.inc:345
-#: personal/mail/sieve/class_sieveManagement.inc:1031
-#: personal/mail/class_mail-methods-cyrus.inc:281
-#, php-format
-msgid "Cannot log into SIEVE server: %s"
+#: personal/mail/class_mailAccount.inc:373
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:309
-#: personal/mail/class_mail-methods-cyrus.inc:293
+#: personal/mail/class_mailAccount.inc:423
 #, php-format
-msgid "Cannot retrieve SIEVE script: %s"
+msgid "Address is already in use by user '%s'."
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:349
-#, php-format
-msgid "Cannot remove SIEVE script: %s"
+#: personal/mail/class_mailAccount.inc:697
+#: personal/mail/class_mailAccount.inc:865
+#: admin/ogroups/mail/class_mailogroup.inc:120
+#: admin/ogroups/mail/class_mailogroup.inc:157
+#: admin/systems/services/virus/class_goVirusServer.inc:154
+#: admin/systems/services/spam/class_goSpamServer.inc:278
+#: admin/systems/services/mail/class_goMailServer.inc:582
+#: admin/systems/services/imap/class_goImapServer.inc:187
+#: admin/groups/mail/class_groupMail.inc:761
+#: admin/groups/mail/class_groupMail.inc:1009
+msgid "LDAP error"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:395
-msgid "Edited"
+#: personal/mail/class_mailAccount.inc:934 personal/mail/generic.tpl:8
+#: personal/mail/copypaste.tpl:7 admin/ogroups/mail/mail.tpl:10
+#: admin/groups/mail/paste_mail.tpl:8 admin/groups/mail/mail.tpl:10
+msgid "Primary address"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:429
-msgid "Uploaded script is empty!"
+#: personal/mail/class_mailAccount.inc:960
+#: personal/mail/class_mailAccount.inc:1185
+#: personal/mail/class_mailAccount.inc:1355 personal/mail/generic.tpl:47
+#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1060
+#: admin/groups/mail/class_groupMail.inc:1257
+msgid "Quota size"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:431
-#: personal/mail/class_mail-methods-cyrus.inc:213
-#: personal/mail/class_mail-methods-cyrus.inc:231
-msgid "Internal error"
+#: personal/mail/class_mailAccount.inc:969
+#: personal/mail/class_mailAccount.inc:977
+#: personal/mail/class_mailAccount.inc:1364
+msgid "Mail reject size"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:431
-#, php-format
-msgid "Cannot access temporary file '%s'!"
+#: personal/mail/class_mailAccount.inc:981
+#: personal/mail/class_mailAccount.inc:1371
+msgid "Spam folder"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:433
-#, php-format
-msgid "Cannot open temporary file '%s'!"
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:1376
+msgid "Vacation interval"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:493
-#: personal/mail/sieve/class_sieveManagement.inc:496
-#: personal/mail/sieve/class_sieveManagement.inc:712
-#: personal/mail/sieve/class_sieveManagement.inc:715
-#: personal/mail/sieve/templates/element_keep.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:22
-#: personal/mail/sieve/templates/object_container.tpl:25
-msgid "Keep"
+#: personal/mail/class_mailAccount.inc:1030
+#: personal/mail/class_mailAccount.inc:1042
+#: personal/mail/class_mailAccount.inc:1075
+#: personal/mail/class_mailAccount.inc:1086
+#: addons/mailqueue/class_mailqueue.inc:94
+#: addons/mailqueue/class_mailqueue.inc:123
+#: addons/mailqueue/class_mailqueue.inc:184
+#: addons/mailqueue/class_mailqueue.inc:214
+msgid "Permission error"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:494
-#: personal/mail/sieve/class_sieveManagement.inc:713
-#: personal/mail/sieve/templates/element_comment.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:23
-msgid "Comment"
+#: personal/mail/class_mailAccount.inc:1030
+#: personal/mail/class_mailAccount.inc:1042
+#: personal/mail/class_mailAccount.inc:1075
+#: personal/mail/class_mailAccount.inc:1086
+msgid "You have no permission to modify these addresses!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:495
-#: personal/mail/sieve/class_sieveManagement.inc:714
-msgid "File into"
+#: personal/mail/class_mailAccount.inc:1151
+msgid "Waiting for kolab to remove mail properties..."
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:497
-#: personal/mail/sieve/class_sieveManagement.inc:716
-#: personal/mail/sieve/templates/element_discard.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:26
-msgid "Discard"
+#: personal/mail/class_mailAccount.inc:1153
+msgid ""
+"Please remove the mail settings first to allow kolab to call its remove "
+"methods!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:498
-#: personal/mail/sieve/class_sieveManagement.inc:717
-#: personal/mail/sieve/templates/element_redirect.tpl:13
-#: personal/mail/sieve/templates/object_container.tpl:27
-msgid "Redirect"
+#: personal/mail/class_mailAccount.inc:1174 personal/mail/copypaste.tpl:1
+#: admin/groups/mail/paste_mail.tpl:1
+msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:499
-#: personal/mail/sieve/class_sieveManagement.inc:718
-#: personal/mail/sieve/templates/object_container.tpl:28
-msgid "Reject"
+#: personal/mail/class_mailAccount.inc:1178
+msgid "My account"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:500
-#: personal/mail/sieve/class_sieveManagement.inc:719
-#: personal/mail/sieve/templates/element_require.tpl:12
-#: personal/mail/sieve/templates/object_container.tpl:29
-msgid "Require"
+#: personal/mail/class_mailAccount.inc:1184
+#: admin/groups/mail/class_groupMail.inc:1085
+#: admin/groups/mail/class_groupMail.inc:1258
+msgid "Mail server"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:501
-#: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/sieve/templates/element_stop.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:30
-#: admin/systems/services/imap/class_goImapServer.inc:207
-#: admin/systems/services/virus/class_goVirusServer.inc:229
-msgid "Stop"
+#: personal/mail/class_mailAccount.inc:1187
+msgid "Add vacation information"
 msgstr ""
 
+#: personal/mail/class_mailAccount.inc:1188
+#: personal/mail/sieve/templates/object_container.tpl:31
+#: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:721
-#: personal/mail/sieve/templates/element_vacation.tpl:44
-#: personal/mail/sieve/templates/object_container.tpl:31
-#: personal/mail/generic.tpl:241 personal/mail/class_mailAccount.inc:1186
+#: personal/mail/generic.tpl:241
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:503
-#: personal/mail/sieve/class_sieveManagement.inc:722
-#: personal/mail/sieve/templates/object_container.tpl:32
-#: personal/mail/sieve/class_sieveElement_If.inc:836
-msgid "If"
+#: personal/mail/class_mailAccount.inc:1190
+msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:519
-msgid "Cannot add new element!"
+#: personal/mail/class_mailAccount.inc:1191
+msgid "Spam level"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:562
-#: personal/mail/sieve/class_sieveManagement.inc:757
-#: personal/mail/sieve/templates/element_else.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:33
-#: personal/mail/sieve/class_sieveElement_If.inc:840
-msgid "Else"
+#: personal/mail/class_mailAccount.inc:1192
+msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:564
-#: personal/mail/sieve/class_sieveManagement.inc:759
-#: personal/mail/sieve/class_sieveManagement.inc:764
-#: personal/mail/sieve/templates/element_elsif.tpl:4
-#: personal/mail/sieve/templates/object_container.tpl:34
-#: personal/mail/sieve/class_sieveElement_If.inc:838
-msgid "Else If"
+#: personal/mail/class_mailAccount.inc:1194
+msgid "Sieve management"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:589
-#: personal/mail/sieve/templates/element_address.tpl:15
-#: personal/mail/sieve/templates/element_address.tpl:113
-msgid "Address"
+#: personal/mail/class_mailAccount.inc:1196
+msgid "Reject due to mailsize"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:590
-#: personal/mail/sieve/templates/element_header.tpl:16
-#: personal/mail/sieve/templates/element_header.tpl:106
-msgid "Header"
+#: personal/mail/class_mailAccount.inc:1197
+#: admin/groups/mail/class_groupMail.inc:1069
+msgid "Mail max size"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:591
-#: personal/mail/sieve/templates/element_envelope.tpl:16
-#: personal/mail/sieve/templates/element_envelope.tpl:105
-msgid "Envelope"
+#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1204
+msgid "Forwarding address"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:592
-#: personal/mail/sieve/templates/element_size.tpl:4
-#: addons/mailqueue/contents.tpl:54
-msgid "Size"
+#: personal/mail/class_mailAccount.inc:1200
+msgid "Local delivery"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:593
-#: personal/mail/sieve/templates/element_exists.tpl:8
-msgid "Exists"
+#: personal/mail/class_mailAccount.inc:1201
+msgid "No delivery to own mailbox "
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:1202
+msgid "Mail alternative addresses"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:1205 personal/mail/generic.tpl:124
+msgid "Use custom sieve script"
+msgstr ""
+
+#: personal/mail/sieve/class_sieveElement_Reject.inc:21
+msgid "Invalid character found, quotes are not allowed in a reject message."
+msgstr ""
+
+#: personal/mail/sieve/class_sieveElement_Reject.inc:37
+msgid "Your reject text here"
+msgstr ""
+
+#: personal/mail/sieve/class_My_Tree.inc:245
+#: personal/mail/sieve/templates/remove_script.tpl:2
+#: personal/mail/class_mail-methods-cyrus.inc:52
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/sieve/class_My_Tree.inc:245
+msgid "Cannot remove last element!"
+msgstr ""
+
+#: personal/mail/sieve/class_My_Tree.inc:658
+msgid "Require must be the first command in the script."
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:16
+#: personal/mail/sieve/templates/element_header.tpl:106
+#: personal/mail/sieve/class_sieveManagement.inc:590
+msgid "Header"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:19
+#: personal/mail/sieve/templates/element_envelope.tpl:19
+#: personal/mail/sieve/templates/element_address.tpl:18
+#: personal/mail/sieve/templates/element_vacation.tpl:16
+msgid "Normal view"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:26
+#: personal/mail/sieve/templates/element_envelope.tpl:26
+#: personal/mail/sieve/templates/element_address.tpl:25
+msgid "Match type"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:29
+#: personal/mail/sieve/templates/element_header.tpl:52
+#: personal/mail/sieve/templates/element_header.tpl:63
+#: personal/mail/sieve/templates/element_header.tpl:114
+#: personal/mail/sieve/templates/element_header.tpl:119
+#: personal/mail/sieve/templates/element_boolean.tpl:5
+#: personal/mail/sieve/templates/element_envelope.tpl:29
+#: personal/mail/sieve/templates/element_envelope.tpl:52
+#: personal/mail/sieve/templates/element_envelope.tpl:63
+#: personal/mail/sieve/templates/element_envelope.tpl:113
+#: personal/mail/sieve/templates/element_envelope.tpl:118
+#: personal/mail/sieve/templates/element_address.tpl:28
+#: personal/mail/sieve/templates/element_address.tpl:51
+#: personal/mail/sieve/templates/element_address.tpl:61
+#: personal/mail/sieve/templates/element_address.tpl:72
+#: personal/mail/sieve/templates/element_address.tpl:121
+#: personal/mail/sieve/templates/element_address.tpl:126
+msgid "Boolean value"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:37
+#: personal/mail/sieve/templates/element_envelope.tpl:37
+#: personal/mail/sieve/templates/element_address.tpl:36
+msgid "Invert test"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:41
+#: personal/mail/sieve/templates/element_envelope.tpl:41
+#: personal/mail/sieve/templates/element_address.tpl:40
+msgid "Yes"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:43
+#: personal/mail/sieve/templates/element_envelope.tpl:43
+#: personal/mail/sieve/templates/element_address.tpl:42
+msgid "No"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:49
+#: personal/mail/sieve/templates/element_envelope.tpl:49
+#: personal/mail/sieve/templates/element_address.tpl:58
+msgid "Comparator"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:60
+msgid "operator"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:77
+#: personal/mail/sieve/templates/element_envelope.tpl:76
+#: personal/mail/sieve/templates/element_address.tpl:85
+msgid "Address fields to include"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:81
+#: personal/mail/sieve/templates/element_envelope.tpl:80
+#: personal/mail/sieve/templates/element_address.tpl:89
+msgid "Values to match for"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:109
+#: personal/mail/sieve/templates/element_allof.tpl:5
+#: personal/mail/sieve/templates/element_anyof.tpl:5
+#: personal/mail/sieve/templates/element_size.tpl:11
+#: personal/mail/sieve/templates/element_envelope.tpl:108
+#: personal/mail/sieve/templates/element_address.tpl:116
+#: personal/mail/sieve/templates/element_exists.tpl:10
+msgid "Not"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:111
+#: personal/mail/sieve/templates/element_allof.tpl:7
+#: personal/mail/sieve/templates/element_size.tpl:13
+#: personal/mail/sieve/templates/element_envelope.tpl:110
+#: personal/mail/sieve/templates/element_address.tpl:118
+#: personal/mail/sieve/templates/element_exists.tpl:12
+msgid "-"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_header.tpl:131
+#: personal/mail/sieve/templates/element_envelope.tpl:130
+#: personal/mail/sieve/templates/element_address.tpl:138
+#: personal/mail/sieve/templates/element_vacation.tpl:47
+msgid "Expert view"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_allof.tpl:5
+#: personal/mail/sieve/templates/element_allof.tpl:7
+#: personal/mail/sieve/templates/element_anyof.tpl:5
+#: personal/mail/sieve/templates/element_anyof.tpl:7
+#: personal/mail/sieve/templates/element_size.tpl:11
+#: personal/mail/sieve/templates/element_size.tpl:13
+#: personal/mail/sieve/templates/element_envelope.tpl:41
+#: personal/mail/sieve/templates/element_envelope.tpl:43
+#: personal/mail/sieve/templates/element_exists.tpl:10
+#: personal/mail/sieve/templates/element_exists.tpl:12
+msgid "Inverse match"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:594
 #: personal/mail/sieve/templates/element_allof.tpl:10
+#: personal/mail/sieve/class_sieveManagement.inc:594
 msgid "All of"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:595
+#: personal/mail/sieve/templates/element_stop.tpl:4
+#: personal/mail/sieve/templates/object_container.tpl:30
+#: personal/mail/sieve/class_sieveManagement.inc:501
+#: personal/mail/sieve/class_sieveManagement.inc:720
+#: admin/systems/services/virus/class_goVirusServer.inc:229
+#: admin/systems/services/imap/class_goImapServer.inc:207
+msgid "Stop"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_stop.tpl:9
+msgid "Stop execution here"
+msgstr ""
+
 #: personal/mail/sieve/templates/element_anyof.tpl:10
+#: personal/mail/sieve/class_sieveManagement.inc:595
 msgid "Any of"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:596
-#: personal/mail/sieve/class_sieveElement_If.inc:915
-msgid "True"
+#: personal/mail/sieve/templates/element_if.tpl:4
+#: personal/mail/sieve/class_sieveElement_If.inc:834
+msgid "Condition"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:597
-#: personal/mail/sieve/class_sieveElement_If.inc:915
-msgid "False"
+#: personal/mail/sieve/templates/element_size.tpl:4
+#: personal/mail/sieve/class_sieveManagement.inc:592
+#: addons/mailqueue/contents.tpl:54
+msgid "Size"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:634
-#: addons/mailqueue/contents.tpl:76 addons/mailqueue/class_mailqueue.inc:390
-msgid "Active"
+#: personal/mail/sieve/templates/element_size.tpl:16
+msgid "Select match type"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:635
-msgid "This script is marked as active"
+#: personal/mail/sieve/templates/element_size.tpl:20
+msgid "Select value unit"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:640
-msgid "Script length"
+#: personal/mail/sieve/templates/add_element.tpl:1
+msgid "Add a new element"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:644
-msgid "Remove script"
+#: personal/mail/sieve/templates/add_element.tpl:2
+msgid "Please select the type of element you want to add"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:653
-msgid "Activate script"
+#: personal/mail/sieve/templates/add_element.tpl:11
+#: personal/mail/sieve/templates/select_test_type.tpl:11
+msgid "Continue"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:657
-msgid "Edit script"
+#: personal/mail/sieve/templates/add_element.tpl:13
+msgid "Abort"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:672
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+#: personal/mail/sieve/templates/element_comment.tpl:4
+#: personal/mail/sieve/templates/object_container.tpl:23
+#: personal/mail/sieve/class_sieveManagement.inc:494
+#: personal/mail/sieve/class_sieveManagement.inc:713
+msgid "Comment"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:771
-msgid "Cannot insert element at the requested position!"
+#: personal/mail/sieve/templates/element_comment.tpl:8
+msgid "Edit"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:1044
-#: personal/mail/class_mail-methods-cyrus.inc:364
-#, php-format
-msgid "Cannot store SIEVE script: %s"
+#: personal/mail/sieve/templates/object_container_clear.tpl:8
+msgid "Move this object up one position"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:1046
-msgid "Failed to save sieve script"
+#: personal/mail/sieve/templates/object_container_clear.tpl:8
+#: personal/mail/sieve/templates/object_container.tpl:8
+msgid "Up"
 msgstr ""
 
-#: personal/mail/sieve/class_My_Tree.inc:245
-#: personal/mail/sieve/templates/remove_script.tpl:2
-#: personal/mail/class_mail-methods-cyrus.inc:52
-msgid "Warning"
+#: personal/mail/sieve/templates/object_container_clear.tpl:9
+#: personal/mail/sieve/templates/object_container.tpl:9
+msgid "Move up"
 msgstr ""
 
-#: personal/mail/sieve/class_My_Tree.inc:245
-msgid "Cannot remove last element!"
+#: personal/mail/sieve/templates/object_container_clear.tpl:12
+msgid "Move this object down one position"
 msgstr ""
 
-#: personal/mail/sieve/class_My_Tree.inc:658
-msgid "Require must be the first command in the script."
+#: personal/mail/sieve/templates/object_container_clear.tpl:12
+#: personal/mail/sieve/templates/object_container.tpl:12
+msgid "Down"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_fileinto.tpl:4
-msgid "Move mail into folder"
+#: personal/mail/sieve/templates/object_container_clear.tpl:13
+#: personal/mail/sieve/templates/object_container.tpl:13
+msgid "Move down"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_fileinto.tpl:8
-msgid "Select from list"
+#: personal/mail/sieve/templates/object_container_clear.tpl:16
+msgid "Remove this object"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_fileinto.tpl:10
-msgid "Manual selection"
+#: personal/mail/sieve/templates/object_container_clear.tpl:17
+#: personal/mail/sieve/templates/object_container.tpl:17
+msgid "Remove element"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_fileinto.tpl:18
-msgid "Folder"
+#: personal/mail/sieve/templates/create_script.tpl:2
+msgid ""
+"Please enter the name for the new script below. Script names must consist of "
+"lower case characters only."
 msgstr ""
 
-#: personal/mail/sieve/templates/object_test_container.tpl:6
-msgid "Add object"
+#: personal/mail/sieve/templates/create_script.tpl:8
+msgid "Script name"
+msgstr ""
+
+#: personal/mail/sieve/templates/import_script.tpl:1
+msgid "Import sieve script"
+msgstr ""
+
+#: personal/mail/sieve/templates/import_script.tpl:2
+msgid ""
+"Please select the sieve script you want to import. Use the import button to "
+"import the script or the cancel button to abort."
+msgstr ""
+
+#: personal/mail/sieve/templates/import_script.tpl:5
+msgid "Script to import"
+msgstr ""
+
+#: personal/mail/sieve/templates/import_script.tpl:12
+#: personal/mail/sieve/templates/edit_frame_base.tpl:7
+#: personal/mail/generic.tpl:256
+msgid "Import"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_keep.tpl:4
+#: personal/mail/sieve/templates/object_container.tpl:22
+#: personal/mail/sieve/templates/object_container.tpl:25
+#: personal/mail/sieve/class_sieveManagement.inc:493
+#: personal/mail/sieve/class_sieveManagement.inc:496
+#: personal/mail/sieve/class_sieveManagement.inc:712
+#: personal/mail/sieve/class_sieveManagement.inc:715
+msgid "Keep"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_keep.tpl:9
+msgid "Keep message"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_redirect.tpl:13
+#: personal/mail/sieve/templates/object_container.tpl:27
+#: personal/mail/sieve/class_sieveManagement.inc:498
+#: personal/mail/sieve/class_sieveManagement.inc:717
+msgid "Redirect"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_redirect.tpl:18
+msgid "Redirect mail to following recipients"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_discard.tpl:4
+#: personal/mail/sieve/templates/object_container.tpl:26
+#: personal/mail/sieve/class_sieveManagement.inc:497
+#: personal/mail/sieve/class_sieveManagement.inc:716
+msgid "Discard"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_discard.tpl:9
+msgid "Discard message"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_require.tpl:12
+#: personal/mail/sieve/templates/object_container.tpl:29
+#: personal/mail/sieve/class_sieveManagement.inc:500
+#: personal/mail/sieve/class_sieveManagement.inc:719
+msgid "Require"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:8
+msgid "Move object up one position"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:12
+msgid "Move object down one position"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_test_container.tpl:10
 #: personal/mail/sieve/templates/object_container.tpl:16
+#: personal/mail/sieve/templates/object_test_container.tpl:10
 msgid "Remove object"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_allof.tpl:5
-#: personal/mail/sieve/templates/element_envelope.tpl:108
-#: personal/mail/sieve/templates/element_exists.tpl:10
-#: personal/mail/sieve/templates/element_size.tpl:11
-#: personal/mail/sieve/templates/element_anyof.tpl:5
-#: personal/mail/sieve/templates/element_header.tpl:109
-#: personal/mail/sieve/templates/element_address.tpl:116
-msgid "Not"
+#: personal/mail/sieve/templates/object_container.tpl:21
+msgid "choose element"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:24
+msgid "Fileinto"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:28
+#: personal/mail/sieve/class_sieveManagement.inc:499
+#: personal/mail/sieve/class_sieveManagement.inc:718
+msgid "Reject"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:32
+#: personal/mail/sieve/class_sieveManagement.inc:503
+#: personal/mail/sieve/class_sieveManagement.inc:722
+#: personal/mail/sieve/class_sieveElement_If.inc:836
+msgid "If"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:33
+#: personal/mail/sieve/templates/element_else.tpl:4
+#: personal/mail/sieve/class_sieveManagement.inc:562
+#: personal/mail/sieve/class_sieveManagement.inc:757
+#: personal/mail/sieve/class_sieveElement_If.inc:840
+msgid "Else"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:34
+#: personal/mail/sieve/templates/element_elsif.tpl:4
+#: personal/mail/sieve/class_sieveManagement.inc:564
+#: personal/mail/sieve/class_sieveManagement.inc:759
+#: personal/mail/sieve/class_sieveManagement.inc:764
+#: personal/mail/sieve/class_sieveElement_If.inc:838
+msgid "Else If"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:38
+#: personal/mail/sieve/templates/object_container.tpl:42
+msgid "Add new"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:38
+#: personal/mail/sieve/templates/object_container.tpl:40
+msgid "Add a new object above this one."
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:40
+msgid "Add element above"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:42
+#: personal/mail/sieve/templates/object_container.tpl:44
+msgid "Add a new object below this one."
+msgstr ""
+
+#: personal/mail/sieve/templates/object_container.tpl:44
+msgid "Add element below"
+msgstr ""
+
+#: personal/mail/sieve/templates/object_test_container.tpl:6
+msgid "Add object"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_boolean.tpl:4
+msgid "Bool"
+msgstr ""
+
+#: personal/mail/sieve/templates/element_boolean.tpl:8
+msgid "update"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_allof.tpl:5
-#: personal/mail/sieve/templates/element_allof.tpl:7
-#: personal/mail/sieve/templates/element_envelope.tpl:41
-#: personal/mail/sieve/templates/element_envelope.tpl:43
-#: personal/mail/sieve/templates/element_exists.tpl:10
-#: personal/mail/sieve/templates/element_exists.tpl:12
-#: personal/mail/sieve/templates/element_size.tpl:11
-#: personal/mail/sieve/templates/element_size.tpl:13
-#: personal/mail/sieve/templates/element_anyof.tpl:5
-#: personal/mail/sieve/templates/element_anyof.tpl:7
-msgid "Inverse match"
+#: personal/mail/sieve/templates/edit_frame_base.tpl:6
+msgid "Export"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_allof.tpl:7
-#: personal/mail/sieve/templates/element_envelope.tpl:110
-#: personal/mail/sieve/templates/element_exists.tpl:12
-#: personal/mail/sieve/templates/element_size.tpl:13
-#: personal/mail/sieve/templates/element_header.tpl:111
-#: personal/mail/sieve/templates/element_address.tpl:118
-msgid "-"
+#: personal/mail/sieve/templates/edit_frame_base.tpl:12
+msgid "View structured"
+msgstr ""
+
+#: personal/mail/sieve/templates/edit_frame_base.tpl:14
+msgid "View source"
 msgstr ""
 
 #: personal/mail/sieve/templates/management.tpl:1
@@ -483,45 +741,6 @@ msgstr ""
 msgid "Create new script"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_discard.tpl:9
-msgid "Discard message"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_if.tpl:4
-#: personal/mail/sieve/class_sieveElement_If.inc:834
-msgid "Condition"
-msgstr ""
-
-#: personal/mail/sieve/templates/edit_frame_base.tpl:6
-msgid "Export"
-msgstr ""
-
-#: personal/mail/sieve/templates/edit_frame_base.tpl:7
-#: personal/mail/sieve/templates/import_script.tpl:12
-#: personal/mail/generic.tpl:256
-msgid "Import"
-msgstr ""
-
-#: personal/mail/sieve/templates/edit_frame_base.tpl:12
-msgid "View structured"
-msgstr ""
-
-#: personal/mail/sieve/templates/edit_frame_base.tpl:14
-msgid "View source"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_reject.tpl:14
-msgid "Reject mail"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_reject.tpl:17
-msgid "This is a multiline text element"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_reject.tpl:19
-msgid "This is stored as single string"
-msgstr ""
-
 #: personal/mail/sieve/templates/select_test_type.tpl:1
 msgid "Select the type of test you want to add"
 msgstr ""
@@ -530,69 +749,6 @@ msgstr ""
 msgid "Available test types"
 msgstr ""
 
-#: personal/mail/sieve/templates/select_test_type.tpl:11
-#: personal/mail/sieve/templates/add_element.tpl:11
-msgid "Continue"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_boolean.tpl:4
-msgid "Bool"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_boolean.tpl:5
-#: personal/mail/sieve/templates/element_envelope.tpl:29
-#: personal/mail/sieve/templates/element_envelope.tpl:52
-#: personal/mail/sieve/templates/element_envelope.tpl:63
-#: personal/mail/sieve/templates/element_envelope.tpl:113
-#: personal/mail/sieve/templates/element_envelope.tpl:118
-#: personal/mail/sieve/templates/element_header.tpl:29
-#: personal/mail/sieve/templates/element_header.tpl:52
-#: personal/mail/sieve/templates/element_header.tpl:63
-#: personal/mail/sieve/templates/element_header.tpl:114
-#: personal/mail/sieve/templates/element_header.tpl:119
-#: personal/mail/sieve/templates/element_address.tpl:28
-#: personal/mail/sieve/templates/element_address.tpl:51
-#: personal/mail/sieve/templates/element_address.tpl:61
-#: personal/mail/sieve/templates/element_address.tpl:72
-#: personal/mail/sieve/templates/element_address.tpl:121
-#: personal/mail/sieve/templates/element_address.tpl:126
-msgid "Boolean value"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_boolean.tpl:8
-msgid "update"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:13
-msgid "Vacation Message"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:16
-#: personal/mail/sieve/templates/element_envelope.tpl:19
-#: personal/mail/sieve/templates/element_header.tpl:19
-#: personal/mail/sieve/templates/element_address.tpl:18
-msgid "Normal view"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:21
-msgid "Release interval"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:25
-msgid "days"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:30
-msgid "Alternative sender addresses"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_vacation.tpl:47
-#: personal/mail/sieve/templates/element_envelope.tpl:130
-#: personal/mail/sieve/templates/element_header.tpl:131
-#: personal/mail/sieve/templates/element_address.tpl:138
-msgid "Expert view"
-msgstr ""
-
 #: personal/mail/sieve/templates/remove_script.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
@@ -606,34 +762,26 @@ msgid ""
 "'Cancel' to abort."
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:26
-#: personal/mail/sieve/templates/element_header.tpl:26
-#: personal/mail/sieve/templates/element_address.tpl:25
-msgid "Match type"
+#: personal/mail/sieve/templates/element_fileinto.tpl:4
+msgid "Move mail into folder"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:37
-#: personal/mail/sieve/templates/element_header.tpl:37
-#: personal/mail/sieve/templates/element_address.tpl:36
-msgid "Invert test"
+#: personal/mail/sieve/templates/element_fileinto.tpl:8
+msgid "Select from list"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:41
-#: personal/mail/sieve/templates/element_header.tpl:41
-#: personal/mail/sieve/templates/element_address.tpl:40
-msgid "Yes"
+#: personal/mail/sieve/templates/element_fileinto.tpl:10
+msgid "Manual selection"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:43
-#: personal/mail/sieve/templates/element_header.tpl:43
-#: personal/mail/sieve/templates/element_address.tpl:42
-msgid "No"
+#: personal/mail/sieve/templates/element_fileinto.tpl:18
+msgid "Folder"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:49
-#: personal/mail/sieve/templates/element_header.tpl:49
-#: personal/mail/sieve/templates/element_address.tpl:58
-msgid "Comparator"
+#: personal/mail/sieve/templates/element_envelope.tpl:16
+#: personal/mail/sieve/templates/element_envelope.tpl:105
+#: personal/mail/sieve/class_sieveManagement.inc:591
+msgid "Envelope"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_envelope.tpl:60
@@ -641,188 +789,207 @@ msgstr ""
 msgid "Operator"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_envelope.tpl:76
-#: personal/mail/sieve/templates/element_header.tpl:77
-#: personal/mail/sieve/templates/element_address.tpl:85
-msgid "Address fields to include"
-msgstr ""
-
-#: personal/mail/sieve/templates/element_envelope.tpl:80
-#: personal/mail/sieve/templates/element_header.tpl:81
-#: personal/mail/sieve/templates/element_address.tpl:89
-msgid "Values to match for"
+#: personal/mail/sieve/templates/element_address.tpl:15
+#: personal/mail/sieve/templates/element_address.tpl:113
+#: personal/mail/sieve/class_sieveManagement.inc:589
+msgid "Address"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_redirect.tpl:18
-msgid "Redirect mail to following recipients"
+#: personal/mail/sieve/templates/element_address.tpl:48
+msgid "Part of address that should be used"
 msgstr ""
 
-#: personal/mail/sieve/templates/create_script.tpl:2
-msgid ""
-"Please enter the name for the new script below. Script names must consist of "
-"lower case characters only."
+#: personal/mail/sieve/templates/element_exists.tpl:8
+#: personal/mail/sieve/class_sieveManagement.inc:593
+msgid "Exists"
 msgstr ""
 
-#: personal/mail/sieve/templates/create_script.tpl:8
-msgid "Script name"
+#: personal/mail/sieve/templates/element_vacation.tpl:13
+msgid "Vacation Message"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_size.tpl:16
-msgid "Select match type"
+#: personal/mail/sieve/templates/element_vacation.tpl:21
+msgid "Release interval"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_size.tpl:20
-msgid "Select value unit"
+#: personal/mail/sieve/templates/element_vacation.tpl:25
+msgid "days"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:8
-msgid "Move this object up one position"
+#: personal/mail/sieve/templates/element_vacation.tpl:30
+msgid "Alternative sender addresses"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:8
-#: personal/mail/sieve/templates/object_container.tpl:8
-msgid "Up"
+#: personal/mail/sieve/templates/element_reject.tpl:14
+msgid "Reject mail"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:9
-#: personal/mail/sieve/templates/object_container.tpl:9
-msgid "Move up"
+#: personal/mail/sieve/templates/element_reject.tpl:17
+msgid "This is a multiline text element"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:12
-msgid "Move this object down one position"
+#: personal/mail/sieve/templates/element_reject.tpl:19
+msgid "This is stored as single string"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:12
-#: personal/mail/sieve/templates/object_container.tpl:12
-msgid "Down"
+#: personal/mail/sieve/class_sieveElement_Vacation.inc:148
+msgid "Alternative sender address must be a valid email addresses."
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:13
-#: personal/mail/sieve/templates/object_container.tpl:13
-msgid "Move down"
+#: personal/mail/sieve/class_sieveManagement.inc:114
+#: personal/mail/sieve/class_sieveManagement.inc:242
+msgid "Parse failed"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:16
-msgid "Remove this object"
+#: personal/mail/sieve/class_sieveManagement.inc:118
+#: personal/mail/sieve/class_sieveManagement.inc:246
+msgid "Parse successful"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container_clear.tpl:17
-#: personal/mail/sieve/templates/object_container.tpl:17
-msgid "Remove element"
+#: personal/mail/sieve/class_sieveManagement.inc:156
+#, php-format
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 
-#: personal/mail/sieve/templates/element_stop.tpl:9
-msgid "Stop execution here"
+#: personal/mail/sieve/class_sieveManagement.inc:201
+msgid "No script name specified!"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_comment.tpl:8
-msgid "Edit"
+#: personal/mail/sieve/class_sieveManagement.inc:206
+msgid "Please use only lowercase script names!"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_keep.tpl:9
-msgid "Keep message"
+#: personal/mail/sieve/class_sieveManagement.inc:212
+msgid "Please use only alphabetical characters in script names!"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:8
-msgid "Move object up one position"
+#: personal/mail/sieve/class_sieveManagement.inc:218
+msgid "Script name already in use!"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:12
-msgid "Move object down one position"
+#: personal/mail/sieve/class_sieveManagement.inc:302
+#: personal/mail/sieve/class_sieveManagement.inc:309
+#: personal/mail/sieve/class_sieveManagement.inc:345
+#: personal/mail/sieve/class_sieveManagement.inc:349
+#: personal/mail/sieve/class_sieveManagement.inc:398
+#: personal/mail/sieve/class_sieveManagement.inc:402
+#: personal/mail/sieve/class_sieveManagement.inc:433
+#: personal/mail/sieve/class_sieveManagement.inc:519
+#: personal/mail/sieve/class_sieveManagement.inc:771
+#: personal/mail/sieve/class_sieveManagement.inc:1031
+#: personal/mail/sieve/class_sieveManagement.inc:1044
+#: personal/mail/class_mail-methods-cyrus.inc:281
+#: personal/mail/class_mail-methods-cyrus.inc:293
+#: personal/mail/class_mail-methods-cyrus.inc:364
+#: personal/mail/class_mail-methods-cyrus.inc:368
+msgid "SIEVE error"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:21
-msgid "choose element"
+#: personal/mail/sieve/class_sieveManagement.inc:302
+#: personal/mail/sieve/class_sieveManagement.inc:345
+#: personal/mail/sieve/class_sieveManagement.inc:1031
+#: personal/mail/class_mail-methods-cyrus.inc:281
+#, php-format
+msgid "Cannot log into SIEVE server: %s"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:24
-msgid "Fileinto"
+#: personal/mail/sieve/class_sieveManagement.inc:309
+#: personal/mail/class_mail-methods-cyrus.inc:293
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:38
-#: personal/mail/sieve/templates/object_container.tpl:42
-msgid "Add new"
+#: personal/mail/sieve/class_sieveManagement.inc:349
+#, php-format
+msgid "Cannot remove SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:38
-#: personal/mail/sieve/templates/object_container.tpl:40
-msgid "Add a new object above this one."
+#: personal/mail/sieve/class_sieveManagement.inc:395
+msgid "Edited"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:40
-msgid "Add element above"
+#: personal/mail/sieve/class_sieveManagement.inc:429
+msgid "Uploaded script is empty!"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:42
-#: personal/mail/sieve/templates/object_container.tpl:44
-msgid "Add a new object below this one."
+#: personal/mail/sieve/class_sieveManagement.inc:431
+#: personal/mail/class_mail-methods-cyrus.inc:213
+#: personal/mail/class_mail-methods-cyrus.inc:231
+msgid "Internal error"
 msgstr ""
 
-#: personal/mail/sieve/templates/object_container.tpl:44
-msgid "Add element below"
+#: personal/mail/sieve/class_sieveManagement.inc:431
+#, php-format
+msgid "Cannot access temporary file '%s'!"
 msgstr ""
 
-#: personal/mail/sieve/templates/add_element.tpl:1
-msgid "Add a new element"
+#: personal/mail/sieve/class_sieveManagement.inc:433
+#, php-format
+msgid "Cannot open temporary file '%s'!"
 msgstr ""
 
-#: personal/mail/sieve/templates/add_element.tpl:2
-msgid "Please select the type of element you want to add"
+#: personal/mail/sieve/class_sieveManagement.inc:495
+#: personal/mail/sieve/class_sieveManagement.inc:714
+msgid "File into"
 msgstr ""
 
-#: personal/mail/sieve/templates/add_element.tpl:13
-msgid "Abort"
+#: personal/mail/sieve/class_sieveManagement.inc:519
+msgid "Cannot add new element!"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_header.tpl:60
-msgid "operator"
+#: personal/mail/sieve/class_sieveManagement.inc:596
+#: personal/mail/sieve/class_sieveElement_If.inc:915
+msgid "True"
 msgstr ""
 
-#: personal/mail/sieve/templates/import_script.tpl:1
-msgid "Import sieve script"
+#: personal/mail/sieve/class_sieveManagement.inc:597
+#: personal/mail/sieve/class_sieveElement_If.inc:915
+msgid "False"
 msgstr ""
 
-#: personal/mail/sieve/templates/import_script.tpl:2
-msgid ""
-"Please select the sieve script you want to import. Use the import button to "
-"import the script or the cancel button to abort."
+#: personal/mail/sieve/class_sieveManagement.inc:634
+#: addons/mailqueue/contents.tpl:76 addons/mailqueue/class_mailqueue.inc:391
+msgid "Active"
 msgstr ""
 
-#: personal/mail/sieve/templates/import_script.tpl:5
-msgid "Script to import"
+#: personal/mail/sieve/class_sieveManagement.inc:635
+msgid "This script is marked as active"
 msgstr ""
 
-#: personal/mail/sieve/templates/element_address.tpl:48
-msgid "Part of address that should be used"
+#: personal/mail/sieve/class_sieveManagement.inc:640
+msgid "Script length"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Reject.inc:21
-msgid "Invalid character found, quotes are not allowed in a reject message."
+#: personal/mail/sieve/class_sieveManagement.inc:644
+msgid "Remove script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Reject.inc:37
-msgid "Your reject text here"
+#: personal/mail/sieve/class_sieveManagement.inc:653
+msgid "Activate script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Require.inc:73
-msgid "Please specify at least one valid requirement."
+#: personal/mail/sieve/class_sieveManagement.inc:657
+msgid "Edit script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Redirect.inc:24
-msgid "Please specify a valid email address."
+#: personal/mail/sieve/class_sieveManagement.inc:672
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Redirect.inc:35
-msgid "Place a mail address here"
+#: personal/mail/sieve/class_sieveManagement.inc:771
+msgid "Cannot insert element at the requested position!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Comment.inc:21
-msgid "Your comment here"
+#: personal/mail/sieve/class_sieveManagement.inc:1044
+#: personal/mail/class_mail-methods-cyrus.inc:364
+#, php-format
+msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveElement_Vacation.inc:148
-msgid "Alternative sender address must be a valid email addresses."
+#: personal/mail/sieve/class_sieveManagement.inc:1046
+msgid "Failed to save sieve script"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveElement_If.inc:27
@@ -831,7 +998,7 @@ msgstr ""
 
 #: personal/mail/sieve/class_sieveElement_If.inc:27
 #: personal/mail/sieve/class_sieveElement_If.inc:33
-#: admin/groups/mail/class_groupMail.inc:673
+#: admin/groups/mail/class_groupMail.inc:683
 msgid "Default"
 msgstr ""
 
@@ -992,307 +1159,142 @@ msgstr ""
 msgid "Unhandled switch type"
 msgstr ""
 
-#: personal/mail/generic.tpl:5 admin/systems/services/mail/goMailServer.tpl:1
-#: admin/systems/services/imap/goImapServer.tpl:1 admin/groups/mail/mail.tpl:7
-msgid "Generic"
-msgstr ""
-
-#: personal/mail/generic.tpl:11 admin/groups/mail/mail.tpl:14
-msgid "Multiple edit"
-msgstr ""
-
-#: personal/mail/generic.tpl:20 addons/mailqueue/contents.tpl:53
-#: admin/groups/mail/mail.tpl:23
-msgid "Server"
-msgstr ""
-
-#: personal/mail/generic.tpl:23
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: personal/mail/generic.tpl:34 admin/groups/mail/mail.tpl:36
-msgid "Quota usage"
-msgstr ""
-
-#: personal/mail/generic.tpl:41 admin/groups/mail/mail.tpl:43
-msgid "not defined"
-msgstr ""
-
-#: personal/mail/generic.tpl:47 personal/mail/class_mailAccount.inc:958
-#: personal/mail/class_mailAccount.inc:1183
-#: personal/mail/class_mailAccount.inc:1353 admin/groups/mail/mail.tpl:48
-#: admin/groups/mail/class_groupMail.inc:1050
-#: admin/groups/mail/class_groupMail.inc:1249
-msgid "Quota size"
-msgstr ""
-
-#: personal/mail/generic.tpl:92
-msgid "Mail options"
-msgstr ""
-
-#: personal/mail/generic.tpl:124 personal/mail/class_mailAccount.inc:1203
-msgid "Use custom sieve script"
-msgstr ""
-
-#: personal/mail/generic.tpl:124
-msgid "disables all Mail options!"
-msgstr ""
-
-#: personal/mail/generic.tpl:131
-msgid "Sieve Management"
-msgstr ""
-
-#: personal/mail/generic.tpl:144
-msgid "Select if you want to forward mails without getting own copies of them"
-msgstr ""
-
-#: personal/mail/generic.tpl:144
-msgid "No delivery to own mailbox"
-msgstr ""
-
-#: personal/mail/generic.tpl:150
-msgid ""
-"Select to automatically response with the vacation message defined below"
-msgstr ""
-
-#: personal/mail/generic.tpl:152
-msgid "Activate vacation message"
-msgstr ""
-
-#: personal/mail/generic.tpl:160
-msgid "from"
-msgstr ""
-
-#: personal/mail/generic.tpl:183
-msgid "till"
-msgstr ""
-
-#: personal/mail/generic.tpl:212
-msgid "Select if you want to filter this mails through spamassassin"
-msgstr ""
-
-#: personal/mail/generic.tpl:214
-msgid "Move mails tagged with spam level greater than"
-msgstr ""
-
-#: personal/mail/generic.tpl:217
-msgid "Choose spam level - smaller values are more sensitive"
-msgstr ""
-
-#: personal/mail/generic.tpl:221
-msgid "to folder"
-msgstr ""
-
-#: personal/mail/generic.tpl:232
-msgid "Reject mails bigger than"
-msgstr ""
-
-#: personal/mail/generic.tpl:234 admin/groups/mail/mail.tpl:53
-msgid "MB"
-msgstr ""
-
-#: personal/mail/generic.tpl:295
-msgid "Advanced mail options"
-msgstr ""
-
-#: personal/mail/generic.tpl:301
-msgid "Select if user can only send and receive inside his own domain"
+#: personal/mail/sieve/class_sieveElement_Comment.inc:21
+msgid "Your comment here"
 msgstr ""
 
-#: personal/mail/generic.tpl:303
-msgid "User is only allowed to send and receive local mails"
+#: personal/mail/sieve/class_sieveElement_Redirect.inc:24
+msgid "Please specify a valid email address."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:289
-#: personal/mail/class_mailAccount.inc:299
-#: personal/mail/class_mailAccount.inc:302
-#: personal/mail/class_mailAccount.inc:303
-#: personal/mail/class_mailAccount.inc:306
-#: personal/mail/class_mailAccount.inc:307
-#: personal/mail/class_mailAccount.inc:927
-#: personal/mail/class_mailAccount.inc:1171
-#: personal/mail/class_mailAccount.inc:1347
-#: admin/ogroups/mail/paste_mail.tpl:4
-#: admin/ogroups/mail/class_mailogroup.inc:186
-#: admin/groups/mail/class_groupMail.inc:1238
-msgid "Mail"
+#: personal/mail/sieve/class_sieveElement_Redirect.inc:35
+msgid "Place a mail address here"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:16
-#: addons/mailqueue/class_mailqueue.inc:7
-msgid "This does something"
+#: personal/mail/sieve/class_sieveElement_Require.inc:73
+msgid "Please specify at least one valid requirement."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:92
-#: personal/mail/class_mailAccount.inc:213
-#: addons/mailqueue/class_mailqueue.inc:65
-#: addons/mailqueue/class_mailqueue.inc:102
-#: addons/mailqueue/class_mailqueue.inc:132
-#: addons/mailqueue/class_mailqueue.inc:194
-#: addons/mailqueue/class_mailqueue.inc:229
-#: addons/mailqueue/class_mailqueue.inc:242
-#: admin/groups/mail/class_groupMail.inc:82
-msgid "Configuration error"
+#: personal/mail/generic.tpl:5 admin/systems/services/mail/goMailServer.tpl:1
+#: admin/systems/services/imap/goImapServer.tpl:1 admin/groups/mail/mail.tpl:7
+msgid "Generic"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:92
-#, php-format
-msgid "Mail method '%s' is unknown!"
+#: personal/mail/generic.tpl:11 admin/groups/mail/mail.tpl:14
+msgid "Multiple edit"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:213
-#, php-format
-msgid "No DESC tag in vacation template '%s'!"
+#: personal/mail/generic.tpl:20 addons/mailqueue/contents.tpl:53
+#: admin/groups/mail/mail.tpl:23
+msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:300
-msgid "Mail settings cannot be removed while there are delegations configured!"
+#: personal/mail/generic.tpl:23
+msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:348
-msgid "Please select an entry!"
+#: personal/mail/generic.tpl:34 admin/groups/mail/mail.tpl:36
+msgid "Quota usage"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:365
-#: personal/mail/class_mailAccount.inc:401
-#: personal/mail/class_mailAccount.inc:409
-#: personal/mail/class_mailAccount.inc:420
-#: personal/mail/class_mailAccount.inc:936
-#: personal/mail/class_mailAccount.inc:940
-#: personal/mail/class_mailAccount.inc:951
-#: personal/mail/class_mailAccount.inc:1181
-#: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/ogroups/mail/class_mailogroup.inc:93
-#: admin/ogroups/mail/class_mailogroup.inc:194
-#: admin/groups/mail/class_groupMail.inc:472
-#: admin/groups/mail/class_groupMail.inc:1035
-#: admin/groups/mail/class_groupMail.inc:1038
-#: admin/groups/mail/class_groupMail.inc:1044
-#: admin/groups/mail/class_groupMail.inc:1246
-msgid "Mail address"
+#: personal/mail/generic.tpl:41 admin/groups/mail/mail.tpl:43
+msgid "not defined"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:371
-msgid "Cannot add primary address to the list of forwarders!"
+#: personal/mail/generic.tpl:64 personal/mail/copypaste.tpl:25
+#: admin/groups/mail/paste_mail.tpl:23 admin/groups/mail/mail.tpl:102
+msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:421
-#, php-format
-msgid "Address is already in use by user '%s'."
+#: personal/mail/generic.tpl:67 personal/mail/copypaste.tpl:55
+#: admin/groups/mail/paste_mail.tpl:24 admin/groups/mail/mail.tpl:105
+msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:695
-#: personal/mail/class_mailAccount.inc:863
-#: admin/systems/services/mail/class_goMailServer.inc:582
-#: admin/systems/services/imap/class_goImapServer.inc:187
-#: admin/systems/services/spam/class_goSpamServer.inc:278
-#: admin/systems/services/virus/class_goVirusServer.inc:154
-#: admin/ogroups/mail/class_mailogroup.inc:120
-#: admin/ogroups/mail/class_mailogroup.inc:157
-#: admin/groups/mail/class_groupMail.inc:751
-#: admin/groups/mail/class_groupMail.inc:999
-msgid "LDAP error"
+#: personal/mail/generic.tpl:92
+msgid "Mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:967
-#: personal/mail/class_mailAccount.inc:975
-#: personal/mail/class_mailAccount.inc:1362
-msgid "Mail reject size"
+#: personal/mail/generic.tpl:124
+msgid "disables all Mail options!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:979
-#: personal/mail/class_mailAccount.inc:1369
-msgid "Spam folder"
+#: personal/mail/generic.tpl:131
+msgid "Sieve Management"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:983
-#: personal/mail/class_mailAccount.inc:1374
-msgid "Vacation interval"
+#: personal/mail/generic.tpl:144
+msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1028
-#: personal/mail/class_mailAccount.inc:1040
-#: personal/mail/class_mailAccount.inc:1073
-#: personal/mail/class_mailAccount.inc:1084
-#: addons/mailqueue/class_mailqueue.inc:93
-#: addons/mailqueue/class_mailqueue.inc:122
-#: addons/mailqueue/class_mailqueue.inc:183
-#: addons/mailqueue/class_mailqueue.inc:213
-msgid "Permission error"
+#: personal/mail/generic.tpl:144
+msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1028
-#: personal/mail/class_mailAccount.inc:1040
-#: personal/mail/class_mailAccount.inc:1073
-#: personal/mail/class_mailAccount.inc:1084
-msgid "You have no permission to modify these addresses!"
+#: personal/mail/generic.tpl:150
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1149
-msgid "Waiting for kolab to remove mail properties..."
+#: personal/mail/generic.tpl:152
+msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1151
-msgid ""
-"Please remove the mail settings first to allow kolab to call its remove "
-"methods!"
+#: personal/mail/generic.tpl:160
+msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1176
-msgid "My account"
+#: personal/mail/generic.tpl:183
+msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1182
-#: admin/groups/mail/class_groupMail.inc:1075
-#: admin/groups/mail/class_groupMail.inc:1250
-msgid "Mail server"
+#: personal/mail/generic.tpl:212
+msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1185
-msgid "Add vacation information"
+#: personal/mail/generic.tpl:214
+msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1188
-msgid "Use spam filter"
+#: personal/mail/generic.tpl:217
+msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1189
-msgid "Spam level"
+#: personal/mail/generic.tpl:221
+msgid "to folder"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1190
-msgid "Spam mail box"
+#: personal/mail/generic.tpl:232
+msgid "Reject mails bigger than"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1192
-msgid "Sieve management"
+#: personal/mail/generic.tpl:234 admin/groups/mail/mail.tpl:53
+msgid "MB"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1194
-msgid "Reject due to mailsize"
+#: personal/mail/generic.tpl:262 personal/mail/copypaste.tpl:13
+msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1195
-#: admin/groups/mail/class_groupMail.inc:1059
-msgid "Mail max size"
+#: personal/mail/generic.tpl:285 personal/mail/copypaste.tpl:44
+#: admin/groups/mail/paste_mail.tpl:42 admin/groups/mail/mail.tpl:208
+msgid "Add local"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1197
-#: personal/mail/class_mailAccount.inc:1202
-msgid "Forwarding address"
+#: personal/mail/generic.tpl:295
+msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1198
-msgid "Local delivery"
+#: personal/mail/generic.tpl:301
+msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1199
-msgid "No delivery to own mailbox "
+#: personal/mail/generic.tpl:303
+msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1200
-msgid "Mail alternative addresses"
+#: personal/mail/main.inc:126
+msgid "User mail settings"
 msgstr ""
 
 #: personal/mail/class_mail-methods-cyrus.inc:52
@@ -1338,11 +1340,6 @@ msgstr ""
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
 
-#: addons/mailqueue/main.inc:43 addons/mailqueue/class_mailqueue.inc:6
-#: addons/mailqueue/class_mailqueue.inc:400
-msgid "Mail queue"
-msgstr ""
-
 #: addons/mailqueue/contents.tpl:10 addons/mailqueue/contents.tpl:26
 msgid "Search"
 msgstr ""
@@ -1375,7 +1372,7 @@ msgstr ""
 msgid "Remove all messages from selected servers queue"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:31 addons/mailqueue/class_mailqueue.inc:410
+#: addons/mailqueue/contents.tpl:31 addons/mailqueue/class_mailqueue.inc:411
 msgid "Hold all messages"
 msgstr ""
 
@@ -1391,7 +1388,7 @@ msgstr ""
 msgid "Release all messages in selected servers queue"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:35 addons/mailqueue/class_mailqueue.inc:412
+#: addons/mailqueue/contents.tpl:35 addons/mailqueue/class_mailqueue.inc:413
 msgid "Requeue all messages"
 msgstr ""
 
@@ -1439,7 +1436,7 @@ msgstr ""
 msgid "hold"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:102 addons/mailqueue/class_mailqueue.inc:414
+#: addons/mailqueue/contents.tpl:102 addons/mailqueue/class_mailqueue.inc:415
 msgid "Hold message"
 msgstr ""
 
@@ -1459,180 +1456,349 @@ msgstr ""
 msgid "Display header from this message"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:66
+#: addons/mailqueue/main.inc:43 addons/mailqueue/class_mailqueue.inc:6
+#: addons/mailqueue/class_mailqueue.inc:401
+msgid "Mail queue"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:67
 #, php-format
 msgid "Missing '%s' directive in configuration!"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:94
-#: addons/mailqueue/class_mailqueue.inc:122
-#: addons/mailqueue/class_mailqueue.inc:184
-#: addons/mailqueue/class_mailqueue.inc:214
+#: addons/mailqueue/class_mailqueue.inc:95
+#: addons/mailqueue/class_mailqueue.inc:123
+#: addons/mailqueue/class_mailqueue.inc:185
+#: addons/mailqueue/class_mailqueue.inc:215
 #, php-format
 msgid "You have no permission to submit a '%s' command!"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:103
-#: addons/mailqueue/class_mailqueue.inc:401
-#: addons/mailqueue/class_mailqueue.inc:406
+#: addons/mailqueue/class_mailqueue.inc:104
+#: addons/mailqueue/class_mailqueue.inc:402
+#: addons/mailqueue/class_mailqueue.inc:407
 msgid "Mail queue addon"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:133
-#: addons/mailqueue/class_mailqueue.inc:195
-#: addons/mailqueue/class_mailqueue.inc:230
-#, php-format
-msgid "'%s' defined for the '%s' directive cannot be executed!"
+#: addons/mailqueue/class_mailqueue.inc:134
+#: addons/mailqueue/class_mailqueue.inc:196
+#: addons/mailqueue/class_mailqueue.inc:231
+#, php-format
+msgid "'%s' defined for the '%s' directive cannot be executed!"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:243
+msgid "No mail servers specified!"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:293
+msgid "up"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:295
+msgid "down"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:323
+#: addons/mailqueue/class_mailqueue.inc:388
+msgid "All"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:338
+msgid "no limit"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:341
+msgid "hour"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:343
+msgid "hours"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:389
+msgid "Hold"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:390
+msgid "Un hold"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:392
+msgid "Not active"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:410
+msgid "Unhold all messages"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:412
+msgid "Delete all messages"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:414
+msgid "Unhold message"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:416
+msgid "Delete message"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:417
+msgid "Requeue message"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:418
+msgid "Gathering queue data"
+msgstr ""
+
+#: addons/mailqueue/class_mailqueue.inc:419
+msgid "Get header information"
+msgstr ""
+
+#: admin/ogroups/mail/paste_mail.tpl:7
+msgid "Please enter a mail address"
+msgstr ""
+
+#: admin/ogroups/mail/class_mailogroup.inc:50
+#: admin/groups/mail/class_groupMail.inc:363
+msgid "Remove mail account"
+msgstr ""
+
+#: admin/ogroups/mail/class_mailogroup.inc:51
+#: admin/ogroups/mail/class_mailogroup.inc:54
+msgid "mail group"
+msgstr ""
+
+#: admin/ogroups/mail/class_mailogroup.inc:53
+#: admin/groups/mail/class_groupMail.inc:366
+msgid "Create mail account"
+msgstr ""
+
+#: admin/ogroups/mail/class_mailogroup.inc:86
+#: admin/groups/mail/class_groupMail.inc:1048
+msgid "your-name@your-domain.com"
+msgstr ""
+
+#: admin/ogroups/mail/class_mailogroup.inc:187
+msgid "Mail group"
+msgstr ""
+
+#: admin/ogroups/mail/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: admin/ogroups/mail/mail.tpl:13
+msgid "Primary mail address for this distribution list"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:5
+msgid "Generic virus filtering"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:13
+#: admin/systems/services/virus/class_goVirusServer.inc:176
+msgid "Database user"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:23
+#: admin/systems/services/virus/class_goVirusServer.inc:176
+#: admin/systems/services/virus/class_goVirusServer.inc:243
+msgid "Database mirror"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:33
+#: admin/systems/services/virus/class_goVirusServer.inc:176
+#: admin/systems/services/virus/class_goVirusServer.inc:245
+msgid "Http proxy URL"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:43
+#: admin/systems/services/virus/class_goVirusServer.inc:164
+#: admin/systems/services/virus/class_goVirusServer.inc:237
+msgid "Maximum threads"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:47
+msgid "Select number of maximal threads"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:61
+msgid "Max directory recursions"
+msgstr ""
+
+#: admin/systems/services/virus/goVirusServer.tpl:71
+#: admin/systems/services/virus/class_goVirusServer.inc:168
+#: admin/systems/services/virus/class_goVirusServer.inc:244
+msgid "Checks per day"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:242
-msgid "No mail servers specified!"
+#: admin/systems/services/virus/goVirusServer.tpl:84
+#: admin/systems/services/virus/class_goVirusServer.inc:232
+msgid "Enable debugging"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:292
-msgid "up"
+#: admin/systems/services/virus/goVirusServer.tpl:92
+#: admin/systems/services/virus/class_goVirusServer.inc:233
+msgid "Enable mail scanning"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:294
-msgid "down"
+#: admin/systems/services/virus/goVirusServer.tpl:101
+msgid "Archive scanning"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:322
-#: addons/mailqueue/class_mailqueue.inc:387
-msgid "All"
+#: admin/systems/services/virus/goVirusServer.tpl:117
+#: admin/systems/services/virus/class_goVirusServer.inc:234
+msgid "Enable scanning of archives"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:337
-msgid "no limit"
+#: admin/systems/services/virus/goVirusServer.tpl:125
+#: admin/systems/services/virus/class_goVirusServer.inc:235
+msgid "Block encrypted archives"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:340
-msgid "hour"
+#: admin/systems/services/virus/goVirusServer.tpl:134
+#: admin/systems/services/virus/class_goVirusServer.inc:165
+#: admin/systems/services/virus/class_goVirusServer.inc:240
+msgid "Maximum file size"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:342
-msgid "hours"
+#: admin/systems/services/virus/goVirusServer.tpl:143
+msgid "Maximum recursion"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:388
-msgid "Hold"
+#: admin/systems/services/virus/goVirusServer.tpl:152
+#: admin/systems/services/virus/class_goVirusServer.inc:167
+#: admin/systems/services/virus/class_goVirusServer.inc:242
+msgid "Maximum compression ratio"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:389
-msgid "Un hold"
+#: admin/systems/services/virus/class_goVirusServer.inc:45
+#: admin/systems/services/virus/class_goVirusServer.inc:210
+#: admin/systems/services/virus/class_goVirusServer.inc:219
+#: admin/systems/services/virus/class_goVirusServer.inc:220
+msgid "Anti virus"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:391
-msgid "Not active"
+#: admin/systems/services/virus/class_goVirusServer.inc:163
+#: admin/systems/services/virus/class_goVirusServer.inc:238
+msgid "Maximum directory recursions"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:409
-msgid "Unhold all messages"
+#: admin/systems/services/virus/class_goVirusServer.inc:166
+#: admin/systems/services/virus/class_goVirusServer.inc:241
+msgid "Maximum recursions"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:411
-msgid "Delete all messages"
+#: admin/systems/services/virus/class_goVirusServer.inc:220
+#: admin/systems/services/spam/class_goSpamServer.inc:322
+#: admin/systems/services/mail/class_goMailServer.inc:701
+#: admin/systems/services/imap/class_goImapServer.inc:197
+msgid "Services"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:413
-msgid "Unhold message"
+#: admin/systems/services/virus/class_goVirusServer.inc:228
+#: admin/systems/services/imap/class_goImapServer.inc:206
+msgid "Start"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:415
-msgid "Delete message"
+#: admin/systems/services/virus/class_goVirusServer.inc:230
+#: admin/systems/services/imap/class_goImapServer.inc:208
+msgid "Restart"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:416
-msgid "Requeue message"
+#: admin/systems/services/virus/class_goVirusServer.inc:239
+msgid "Anti virus user"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:417
-msgid "Gathering queue data"
+#: admin/systems/services/spam/goSpamServerRule.tpl:6
+msgid "Name"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:418
-msgid "Get header information"
+#: admin/systems/services/spam/goSpamServerRule.tpl:14
+msgid "Rule"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:45
-#: admin/systems/services/mail/class_goMailServer.inc:512
-msgid "Mail smtp service (Postfix)"
+#: admin/systems/services/spam/goSpamServer.tpl:8
+#: admin/systems/services/spam/class_goSpamServer.inc:330
+msgid "Rewrite header"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:600
-#: admin/systems/services/mail/class_goMailServer.inc:711
-msgid "Header size limit"
+#: admin/systems/services/spam/goSpamServer.tpl:18
+#: admin/systems/services/spam/class_goSpamServer.inc:332
+msgid "Required score"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:603
-msgid "Mailbox size limit"
+#: admin/systems/services/spam/goSpamServer.tpl:22
+msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:606
-msgid "Message size limit"
+#: admin/systems/services/spam/goSpamServer.tpl:48
+#: admin/systems/services/mail/goMailServer.tpl:73
+#: admin/systems/services/mail/goMailServer.tpl:104
+#: admin/groups/mail/class_groupMail.inc:627
+msgid "Remove"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:700
-msgid "Mail smtp (Postfix)"
+#: admin/systems/services/spam/goSpamServer.tpl:69
+#: admin/systems/services/spam/class_goSpamServer.inc:335
+msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:701
-msgid "Mail smtp - Postfix"
+#: admin/systems/services/spam/goSpamServer.tpl:72
+msgid "Enable bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:701
-#: admin/systems/services/imap/class_goImapServer.inc:197
-#: admin/systems/services/spam/class_goSpamServer.inc:322
-#: admin/systems/services/virus/class_goVirusServer.inc:220
-msgid "Services"
+#: admin/systems/services/spam/goSpamServer.tpl:75
+#: admin/systems/services/spam/class_goSpamServer.inc:337
+msgid "Enable RBL checks"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:709
-#: admin/systems/services/mail/goMailServer.tpl:7
-msgid "Visible full qualified hostname"
+#: admin/systems/services/spam/goSpamServer.tpl:86
+#: admin/systems/services/spam/class_goSpamServer.inc:338
+msgid "Enable use of Razor"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:710
-msgid "Description"
+#: admin/systems/services/spam/goSpamServer.tpl:89
+#: admin/systems/services/spam/class_goSpamServer.inc:339
+msgid "Enable use of DDC"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:712
-#: admin/systems/services/mail/goMailServer.tpl:26
-msgid "Max mailbox size"
+#: admin/systems/services/spam/goSpamServer.tpl:92
+#: admin/systems/services/spam/class_goSpamServer.inc:340
+msgid "Enable use of Pyzor"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:713
-#: admin/systems/services/mail/goMailServer.tpl:35
-msgid "Max message size"
+#: admin/systems/services/spam/class_goSpamServer.inc:42
+#: admin/systems/services/spam/class_goSpamServer.inc:321
+#: admin/systems/services/spam/class_goSpamServer.inc:322
+#: admin/systems/services/spam/class_goSpamServer.inc:348
+msgid "Spamassassin"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:714
-#: admin/systems/services/mail/goMailServer.tpl:91
-msgid "Domains to accept mail for"
+#: admin/systems/services/spam/class_goSpamServer.inc:217
+msgid "Trusted network"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:715
-#: admin/systems/services/mail/goMailServer.tpl:60
-msgid "Local networks"
+#: admin/systems/services/spam/class_goSpamServer.inc:288
+msgid "Score"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:716
-#: admin/systems/services/mail/goMailServer.tpl:45
-msgid "Relay host"
+#: admin/systems/services/spam/class_goSpamServer.inc:331
+msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:717
-msgid "Transport table"
+#: admin/systems/services/spam/class_goSpamServer.inc:333
+msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:718
-#: admin/systems/services/mail/goMailServer.tpl:149
-msgid "Restrictions for sender"
+#: admin/systems/services/spam/class_goSpamServer.inc:336
+msgid "Enabled bayes auto learning"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:719
-#: admin/systems/services/mail/goMailServer.tpl:175
-msgid "Restrictions for recipient"
+#: admin/systems/services/mail/goMailServer.tpl:7
+#: admin/systems/services/mail/class_goMailServer.inc:709
+msgid "Visible full qualified hostname"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:11
@@ -1653,33 +1819,51 @@ msgstr ""
 msgid "KB"
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:26
+#: admin/systems/services/mail/class_goMailServer.inc:712
+msgid "Max mailbox size"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:31
 msgid "Defines the maximal size of mail box."
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:35
+#: admin/systems/services/mail/class_goMailServer.inc:713
+msgid "Max message size"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:40
 msgid "Specify the maximal size of a message."
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:45
+#: admin/systems/services/mail/class_goMailServer.inc:716
+msgid "Relay host"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:50
 msgid "Relay messages to following host:"
 msgstr ""
 
-#: admin/systems/services/mail/goMailServer.tpl:62
-msgid "Postfix networks"
+#: admin/systems/services/mail/goMailServer.tpl:60
+#: admin/systems/services/mail/class_goMailServer.inc:715
+msgid "Local networks"
 msgstr ""
 
-#: admin/systems/services/mail/goMailServer.tpl:73
-#: admin/systems/services/mail/goMailServer.tpl:104
-#: admin/systems/services/spam/goSpamServer.tpl:48
-#: admin/groups/mail/class_groupMail.inc:627
-msgid "Remove"
+#: admin/systems/services/mail/goMailServer.tpl:62
+msgid "Postfix networks"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:83
 msgid "Domains and routing"
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:91
+#: admin/systems/services/mail/class_goMailServer.inc:714
+msgid "Domains to accept mail for"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:93
 msgid "Postfix is responsible for the following domains:"
 msgstr ""
@@ -1696,11 +1880,21 @@ msgstr ""
 msgid "Restrictions"
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:149
+#: admin/systems/services/mail/class_goMailServer.inc:718
+msgid "Restrictions for sender"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:157
 #: admin/systems/services/mail/goMailServer.tpl:183
 msgid "Restriction filter"
 msgstr ""
 
+#: admin/systems/services/mail/goMailServer.tpl:175
+#: admin/systems/services/mail/class_goMailServer.inc:719
+msgid "Restrictions for recipient"
+msgstr ""
+
 #: admin/systems/services/mail/goMailServer.tpl:204
 #: admin/systems/services/imap/goImapServer.tpl:99
 msgid "The server must be saved before you can use the status flag."
@@ -1726,6 +1920,40 @@ msgstr ""
 msgid "Execute"
 msgstr ""
 
+#: admin/systems/services/mail/class_goMailServer.inc:45
+#: admin/systems/services/mail/class_goMailServer.inc:512
+msgid "Mail smtp service (Postfix)"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:600
+#: admin/systems/services/mail/class_goMailServer.inc:711
+msgid "Header size limit"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:603
+msgid "Mailbox size limit"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:606
+msgid "Message size limit"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:700
+msgid "Mail smtp (Postfix)"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:701
+msgid "Mail smtp - Postfix"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:710
+msgid "Description"
+msgstr ""
+
+#: admin/systems/services/mail/class_goMailServer.inc:717
+msgid "Transport table"
+msgstr ""
+
 #: admin/systems/services/imap/goImapServer.tpl:7
 #: admin/systems/services/imap/class_goImapServer.inc:110
 #: admin/systems/services/imap/class_goImapServer.inc:211
@@ -1800,245 +2028,43 @@ msgstr ""
 msgid "IMAP/POP3"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:206
-#: admin/systems/services/virus/class_goVirusServer.inc:228
-msgid "Start"
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:208
-#: admin/systems/services/virus/class_goVirusServer.inc:230
-msgid "Restart"
-msgstr ""
-
 #: admin/systems/services/imap/class_goImapServer.inc:214
 msgid "Admin password"
 msgstr ""
 
-#: admin/systems/services/spam/class_goSpamServer.inc:42
-#: admin/systems/services/spam/class_goSpamServer.inc:321
-#: admin/systems/services/spam/class_goSpamServer.inc:322
-#: admin/systems/services/spam/class_goSpamServer.inc:348
-msgid "Spamassassin"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:217
-msgid "Trusted network"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:288
-msgid "Score"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:330
-#: admin/systems/services/spam/goSpamServer.tpl:8
-msgid "Rewrite header"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:331
-msgid "Trusted networks"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:332
-#: admin/systems/services/spam/goSpamServer.tpl:18
-msgid "Required score"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:333
-msgid "Rules"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:335
-#: admin/systems/services/spam/goSpamServer.tpl:69
-msgid "Enable use of bayes filtering"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:336
-msgid "Enabled bayes auto learning"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:337
-#: admin/systems/services/spam/goSpamServer.tpl:75
-msgid "Enable RBL checks"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:338
-#: admin/systems/services/spam/goSpamServer.tpl:86
-msgid "Enable use of Razor"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:339
-#: admin/systems/services/spam/goSpamServer.tpl:89
-msgid "Enable use of DDC"
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:340
-#: admin/systems/services/spam/goSpamServer.tpl:92
-msgid "Enable use of Pyzor"
-msgstr ""
-
-#: admin/systems/services/spam/goSpamServerRule.tpl:6
-msgid "Name"
-msgstr ""
-
-#: admin/systems/services/spam/goSpamServerRule.tpl:14
-msgid "Rule"
-msgstr ""
-
-#: admin/systems/services/spam/goSpamServer.tpl:22
-msgid "Select required score to tag mail as spam"
-msgstr ""
-
-#: admin/systems/services/spam/goSpamServer.tpl:72
-msgid "Enable bayes auto learning"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:5
-msgid "Generic virus filtering"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:13
-#: admin/systems/services/virus/class_goVirusServer.inc:176
-msgid "Database user"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:23
-#: admin/systems/services/virus/class_goVirusServer.inc:176
-#: admin/systems/services/virus/class_goVirusServer.inc:243
-msgid "Database mirror"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:33
-#: admin/systems/services/virus/class_goVirusServer.inc:176
-#: admin/systems/services/virus/class_goVirusServer.inc:245
-msgid "Http proxy URL"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:43
-#: admin/systems/services/virus/class_goVirusServer.inc:164
-#: admin/systems/services/virus/class_goVirusServer.inc:237
-msgid "Maximum threads"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:47
-msgid "Select number of maximal threads"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:61
-msgid "Max directory recursions"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:71
-#: admin/systems/services/virus/class_goVirusServer.inc:168
-#: admin/systems/services/virus/class_goVirusServer.inc:244
-msgid "Checks per day"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:84
-#: admin/systems/services/virus/class_goVirusServer.inc:232
-msgid "Enable debugging"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:92
-#: admin/systems/services/virus/class_goVirusServer.inc:233
-msgid "Enable mail scanning"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:101
-msgid "Archive scanning"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:117
-#: admin/systems/services/virus/class_goVirusServer.inc:234
-msgid "Enable scanning of archives"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:125
-#: admin/systems/services/virus/class_goVirusServer.inc:235
-msgid "Block encrypted archives"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:134
-#: admin/systems/services/virus/class_goVirusServer.inc:165
-#: admin/systems/services/virus/class_goVirusServer.inc:240
-msgid "Maximum file size"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:143
-msgid "Maximum recursion"
-msgstr ""
-
-#: admin/systems/services/virus/goVirusServer.tpl:152
-#: admin/systems/services/virus/class_goVirusServer.inc:167
-#: admin/systems/services/virus/class_goVirusServer.inc:242
-msgid "Maximum compression ratio"
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:45
-#: admin/systems/services/virus/class_goVirusServer.inc:210
-#: admin/systems/services/virus/class_goVirusServer.inc:219
-#: admin/systems/services/virus/class_goVirusServer.inc:220
-msgid "Anti virus"
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:163
-#: admin/systems/services/virus/class_goVirusServer.inc:238
-msgid "Maximum directory recursions"
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:166
-#: admin/systems/services/virus/class_goVirusServer.inc:241
-msgid "Maximum recursions"
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:239
-msgid "Anti virus user"
-msgstr ""
-
-#: admin/ogroups/mail/mail.tpl:7
-msgid "Mail distribution list"
-msgstr ""
-
-#: admin/ogroups/mail/mail.tpl:13
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: admin/ogroups/mail/paste_mail.tpl:7
-msgid "Please enter a mail address"
+#: admin/groups/mail/mail_locals.tpl:32
+msgid "Display addresses of department"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:363
-msgid "Remove mail account"
+#: admin/groups/mail/mail_locals.tpl:42
+msgid "Display addresses matching"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:51
-#: admin/ogroups/mail/class_mailogroup.inc:54
-msgid "mail group"
+#: admin/groups/mail/paste_mail.tpl:12 admin/groups/mail/mail.tpl:17
+msgid "Primary mail address for this shared folder"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:366
-msgid "Create mail account"
+#: admin/groups/mail/paste_mail.tpl:34 admin/groups/mail/mail.tpl:178
+msgid "Forward messages to non group members"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:86
-#: admin/groups/mail/class_groupMail.inc:1038
-msgid "your-name@your-domain.com"
+#: admin/groups/mail/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:187
-msgid "Mail group"
+#: admin/groups/mail/mail_admins.tpl:24
+msgid "Select a specific department"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:17 admin/groups/mail/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
+#: admin/groups/mail/mail_admins.tpl:30
+msgid "Choose"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:26
 msgid "Select mail server to place user on"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:59
+#: admin/groups/mail/mail.tpl:59 admin/groups/mail/class_groupMail.inc:1259
 msgid "Folder type"
 msgstr ""
 
@@ -2062,10 +2088,6 @@ msgstr ""
 msgid "Member permission"
 msgstr ""
 
-#: admin/groups/mail/mail.tpl:178 admin/groups/mail/paste_mail.tpl:34
-msgid "Forward messages to non group members"
-msgstr ""
-
 #: admin/groups/mail/mail.tpl:187
 msgid "Used in all groups"
 msgstr ""
@@ -2139,92 +2161,76 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:663
-#: admin/groups/mail/class_groupMail.inc:669
+#: admin/groups/mail/class_groupMail.inc:673
+#: admin/groups/mail/class_groupMail.inc:679
 msgid "Unspecified"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:663
+#: admin/groups/mail/class_groupMail.inc:673
 msgid "Mails"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:664
+#: admin/groups/mail/class_groupMail.inc:674
 msgid "Tasks"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:664
+#: admin/groups/mail/class_groupMail.inc:674
 msgid "Journals"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:665
+#: admin/groups/mail/class_groupMail.inc:675
 msgid "Calendar"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:665
+#: admin/groups/mail/class_groupMail.inc:675
 msgid "Contacts"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:666
+#: admin/groups/mail/class_groupMail.inc:676
 msgid "Notes"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:669
+#: admin/groups/mail/class_groupMail.inc:679
 msgid "Inbox"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:670
+#: admin/groups/mail/class_groupMail.inc:680
 msgid "Drafts"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:670
+#: admin/groups/mail/class_groupMail.inc:680
 msgid "Sent items"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:671
+#: admin/groups/mail/class_groupMail.inc:681
 msgid "Junk mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1067
+#: admin/groups/mail/class_groupMail.inc:1077
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1071
+#: admin/groups/mail/class_groupMail.inc:1081
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1239
+#: admin/groups/mail/class_groupMail.inc:1249
 msgid "Group mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1247
+#: admin/groups/mail/class_groupMail.inc:1259
+msgid "Kolab"
+msgstr ""
+
+#: admin/groups/mail/class_groupMail.inc:1260
 msgid "Alternate addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1248
+#: admin/groups/mail/class_groupMail.inc:1261
 msgid "Forwarding addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1251
+#: admin/groups/mail/class_groupMail.inc:1262
 msgid "Permissions"
 msgstr ""
-
-#: admin/groups/mail/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
-#: admin/groups/mail/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
-#: admin/groups/mail/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr ""
-
-#: admin/groups/mail/mail_admins.tpl:24
-msgid "Select a specific department"
-msgstr ""
-
-#: admin/groups/mail/mail_admins.tpl:30
-msgid "Choose"
-msgstr ""