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

diff --git a/gosa-plugins/mail/locale/messages.po b/gosa-plugins/mail/locale/messages.po
index 510a9aa77..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-03-05 09:01+0100\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"
@@ -44,45 +44,19 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: personal/mail/mail_locals.tpl:75 personal/mail/generic.tpl:77
-#: personal/mail/generic.tpl:282 personal/mail/copypaste.tpl:43
-#: personal/mail/copypaste.tpl:61
-#: admin/systems/services/spam/goSpamServer.tpl:45
-#: admin/systems/services/spam/goSpamServer.tpl:113
-#: admin/systems/services/mail/goMailServer.tpl:70
-#: admin/systems/services/mail/goMailServer.tpl:101
-#: admin/systems/services/mail/goMailServer.tpl:131
-#: admin/systems/services/mail/goMailServer.tpl:165
-#: admin/systems/services/mail/goMailServer.tpl:191
-#: admin/groups/mail/mail_locals.tpl:66 admin/groups/mail/paste_mail.tpl:30
-#: admin/groups/mail/paste_mail.tpl:41 admin/groups/mail/mail.tpl:118
-#: admin/groups/mail/mail.tpl:205 admin/groups/mail/class_groupMail.inc:625
-msgid "Add"
-msgstr ""
-
-#: personal/mail/mail_locals.tpl:77
-#: personal/mail/sieve/templates/element_comment.tpl:10
-#: personal/mail/sieve/templates/create_script.tpl:15
-#: personal/mail/sieve/templates/import_script.tpl:14
-#: personal/mail/sieve/templates/edit_frame_base.tpl:41
-#: personal/mail/sieve/templates/management.tpl:26
-#: personal/mail/sieve/templates/select_test_type.tpl:13
-#: personal/mail/sieve/templates/remove_script.tpl:16
-#: personal/mail/main.inc:106
-#: admin/systems/services/virus/goVirusServer.tpl:170
-#: admin/systems/services/spam/goSpamServerRule.tpl:23
-#: admin/systems/services/spam/goSpamServer.tpl:127
-#: admin/systems/services/mail/goMailServer.tpl:223
-#: admin/systems/services/imap/goImapServer.tpl:118
-#: admin/groups/mail/mail_locals.tpl:68 admin/groups/mail/mail_admins.tpl:39
-msgid "Cancel"
-msgstr ""
-
 #: personal/mail/class_mailAccount.inc:15
-#: personal/mail/class_mailAccount.inc:1152
+#: 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:181
-#: admin/groups/mail/class_groupMail.inc:1219
+#: admin/ogroups/mail/class_mailogroup.inc:186
+#: admin/groups/mail/class_groupMail.inc:1248
 msgid "Mail"
 msgstr ""
 
@@ -92,307 +66,230 @@ msgid "This does something"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:92
-#: personal/mail/class_mailAccount.inc:213
-#: addons/mailqueue/class_mailqueue.inc:64
-#: addons/mailqueue/class_mailqueue.inc:99
-#: addons/mailqueue/class_mailqueue.inc:127
-#: addons/mailqueue/class_mailqueue.inc:187
-#: addons/mailqueue/class_mailqueue.inc:220
-#: addons/mailqueue/class_mailqueue.inc:232
+#: 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 "Unkown mail method '%s' specified!"
+msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:213
+#: personal/mail/class_mailAccount.inc:211
 #, php-format
 msgid "No DESC tag in vacation template '%s'!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:289
-msgid "This account has no mail extensions."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:299
 #: personal/mail/class_mailAccount.inc:302
-#: admin/ogroups/mail/class_mailogroup.inc:50
-#: admin/groups/mail/class_groupMail.inc:364
-msgid "Remove mail account"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:300
-msgid ""
-"This account can't be removed while there are delegations configured. Remove "
-"those delegations first."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:303
-#: admin/groups/mail/class_groupMail.inc:365
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:306
-#: admin/ogroups/mail/class_mailogroup.inc:53
-#: admin/groups/mail/class_groupMail.inc:367
-msgid "Create mail account"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:306
-#: admin/groups/mail/class_groupMail.inc:368
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
+msgid "Mail settings cannot be removed while there are delegations configured!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:358
-#: personal/mail/class_mailAccount.inc:365
-#: personal/mail/class_mailAccount.inc:394
+#: 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:414
+#: 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:200
-#: personal/mail/sieve/class_sieveManagement.inc:205
-#: personal/mail/sieve/class_sieveManagement.inc:211
-#: personal/mail/sieve/class_sieveManagement.inc:217
-#: personal/mail/sieve/class_sieveManagement.inc:430
+#: 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
 #: 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
+#: admin/groups/mail/class_groupMail.inc:441
+#: admin/groups/mail/class_groupMail.inc:467
+#: admin/groups/mail/class_groupMail.inc:472
 msgid "Error"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:359
-#: personal/mail/class_mailAccount.inc:395
+#: personal/mail/class_mailAccount.inc:350
+msgid "Please select an entry!"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:367
 #: personal/mail/class_mailAccount.inc:403
-#: personal/mail/class_mailAccount.inc:414
-#: personal/mail/class_mailAccount.inc:928
-#: personal/mail/class_mailAccount.inc:932
+#: personal/mail/class_mailAccount.inc:411
+#: personal/mail/class_mailAccount.inc:422
 #: personal/mail/class_mailAccount.inc:938
-#: personal/mail/class_mailAccount.inc:1162
-#: admin/ogroups/mail/class_mailogroup.inc:189
-#: admin/groups/mail/class_groupMail.inc:1227
+#: 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/class_mailAccount.inc:365
-msgid "Cannot add your primary address to the list of forwarders."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:415
-#, php-format
-msgid "Already used by user '%s'."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:601
-msgid "January"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:601
-msgid "February"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:601
-msgid "March"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:601
-msgid "April"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:602
-msgid "May"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:602
-msgid "June"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:602
-msgid "July"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:602
-msgid "August"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:602
-msgid "September"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:603
-msgid "October"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:603
-msgid "November"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:603
-msgid "December"
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:690
-#, php-format
-msgid "Removing of user/mail account with dn '%s' failed."
+#: personal/mail/class_mailAccount.inc:373
+msgid "Cannot add primary address to the list of forwarders!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:856
+#: personal/mail/class_mailAccount.inc:423
 #, php-format
-msgid "Saving of user/mail account with dn '%s' failed."
+msgid "Address is already in use by user '%s'."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:919
-#: personal/mail/class_mailAccount.inc:1328
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: 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/class_mailAccount.inc:924 personal/mail/generic.tpl:8
+#: 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/class_mailAccount.inc:944
-#: personal/mail/class_mailAccount.inc:1164 personal/mail/generic.tpl:47
-#: admin/groups/mail/mail.tpl:48 admin/groups/mail/class_groupMail.inc:1230
+#: 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/class_mailAccount.inc:953
-#: personal/mail/class_mailAccount.inc:961
+#: 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/class_mailAccount.inc:965
+#: personal/mail/class_mailAccount.inc:981
+#: personal/mail/class_mailAccount.inc:1371
 msgid "Spam folder"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:969
+#: personal/mail/class_mailAccount.inc:985
+#: personal/mail/class_mailAccount.inc:1376
 msgid "Vacation interval"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1009
-#: personal/mail/class_mailAccount.inc:1021
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1065
-#: addons/mailqueue/class_mailqueue.inc:91
-#: addons/mailqueue/class_mailqueue.inc:118
-#: addons/mailqueue/class_mailqueue.inc:177
-#: addons/mailqueue/class_mailqueue.inc:205
+#: 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/class_mailAccount.inc:1009
-#: personal/mail/class_mailAccount.inc:1021
-#: personal/mail/class_mailAccount.inc:1054
-#: personal/mail/class_mailAccount.inc:1065
-msgid "You have no permission to modify these addresses."
+#: 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/class_mailAccount.inc:1130
-msgid "Waiting for kolab to remove mail properties."
+#: personal/mail/class_mailAccount.inc:1151
+msgid "Waiting for kolab to remove mail properties..."
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1132
+#: personal/mail/class_mailAccount.inc:1153
 msgid ""
-"Please remove the mail account first, to allow kolab to call its remove "
-"methods."
+"Please remove the mail settings first to allow kolab to call its remove "
+"methods!"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1153 personal/mail/copypaste.tpl:1
+#: personal/mail/class_mailAccount.inc:1174 personal/mail/copypaste.tpl:1
 #: admin/groups/mail/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1157
+#: personal/mail/class_mailAccount.inc:1178
 msgid "My account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1163
-#: admin/groups/mail/class_groupMail.inc:1231
+#: 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/class_mailAccount.inc:1166
+#: personal/mail/class_mailAccount.inc:1187
 msgid "Add vacation information"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1167
+#: 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:503
-#: personal/mail/sieve/class_sieveManagement.inc:722
+#: personal/mail/sieve/class_sieveManagement.inc:502
+#: personal/mail/sieve/class_sieveManagement.inc:721
 #: personal/mail/generic.tpl:241
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1169
+#: personal/mail/class_mailAccount.inc:1190
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1170
+#: personal/mail/class_mailAccount.inc:1191
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1171
+#: personal/mail/class_mailAccount.inc:1192
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1173
+#: personal/mail/class_mailAccount.inc:1194
 msgid "Sieve management"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1175
+#: personal/mail/class_mailAccount.inc:1196
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1176
+#: personal/mail/class_mailAccount.inc:1197
+#: admin/groups/mail/class_groupMail.inc:1069
 msgid "Mail max size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1178
-#: personal/mail/class_mailAccount.inc:1183
+#: personal/mail/class_mailAccount.inc:1199
+#: personal/mail/class_mailAccount.inc:1204
 msgid "Forwarding address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1179
+#: personal/mail/class_mailAccount.inc:1200
 msgid "Local delivery"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1180
+#: personal/mail/class_mailAccount.inc:1201
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1181
+#: personal/mail/class_mailAccount.inc:1202
 msgid "Mail alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1184 personal/mail/generic.tpl:124
+#: personal/mail/class_mailAccount.inc:1205 personal/mail/generic.tpl:124
 msgid "Use custom sieve script"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1334
-#: admin/groups/mail/class_groupMail.inc:1036
-msgid "Value in 'Quota size' is not valid."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1343
-#: admin/groups/mail/class_groupMail.inc:1045
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1350
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: personal/mail/class_mailAccount.inc:1355
-msgid "Time interval to show vacation message is not valid."
-msgstr ""
-
 #: personal/mail/sieve/class_sieveElement_Reject.inc:21
 msgid "Invalid character found, quotes are not allowed in a reject message."
 msgstr ""
@@ -417,7 +314,7 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_header.tpl:16
 #: personal/mail/sieve/templates/element_header.tpl:106
-#: personal/mail/sieve/class_sieveManagement.inc:591
+#: personal/mail/sieve/class_sieveManagement.inc:590
 msgid "Header"
 msgstr ""
 
@@ -534,16 +431,16 @@ msgid "Inverse match"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_allof.tpl:10
-#: personal/mail/sieve/class_sieveManagement.inc:595
+#: personal/mail/sieve/class_sieveManagement.inc:594
 msgid "All of"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_stop.tpl:4
 #: personal/mail/sieve/templates/object_container.tpl:30
-#: personal/mail/sieve/class_sieveManagement.inc:502
-#: personal/mail/sieve/class_sieveManagement.inc:721
-#: admin/systems/services/virus/class_goVirusServer.inc:227
-#: admin/systems/services/imap/class_goImapServer.inc:169
+#: 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 ""
 
@@ -552,7 +449,7 @@ msgid "Stop execution here"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_anyof.tpl:10
-#: personal/mail/sieve/class_sieveManagement.inc:596
+#: personal/mail/sieve/class_sieveManagement.inc:595
 msgid "Any of"
 msgstr ""
 
@@ -562,7 +459,7 @@ msgid "Condition"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_size.tpl:4
-#: personal/mail/sieve/class_sieveManagement.inc:593
+#: personal/mail/sieve/class_sieveManagement.inc:592
 #: addons/mailqueue/contents.tpl:54
 msgid "Size"
 msgstr ""
@@ -594,13 +491,12 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_comment.tpl:4
 #: personal/mail/sieve/templates/object_container.tpl:23
-#: personal/mail/sieve/class_sieveManagement.inc:495
-#: personal/mail/sieve/class_sieveManagement.inc:714
+#: personal/mail/sieve/class_sieveManagement.inc:494
+#: personal/mail/sieve/class_sieveManagement.inc:713
 msgid "Comment"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_comment.tpl:8
-#: personal/mail/main.inc:117
 msgid "Edit"
 msgstr ""
 
@@ -651,11 +547,6 @@ msgstr ""
 msgid "Script name"
 msgstr ""
 
-#: personal/mail/sieve/templates/create_script.tpl:13
-#: admin/groups/mail/mail_admins.tpl:37
-msgid "Apply"
-msgstr ""
-
 #: personal/mail/sieve/templates/import_script.tpl:1
 msgid "Import sieve script"
 msgstr ""
@@ -679,10 +570,10 @@ 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:494
-#: personal/mail/sieve/class_sieveManagement.inc:497
-#: personal/mail/sieve/class_sieveManagement.inc:713
-#: personal/mail/sieve/class_sieveManagement.inc:716
+#: 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 ""
 
@@ -692,8 +583,8 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_redirect.tpl:13
 #: personal/mail/sieve/templates/object_container.tpl:27
-#: personal/mail/sieve/class_sieveManagement.inc:499
-#: personal/mail/sieve/class_sieveManagement.inc:718
+#: personal/mail/sieve/class_sieveManagement.inc:498
+#: personal/mail/sieve/class_sieveManagement.inc:717
 msgid "Redirect"
 msgstr ""
 
@@ -703,8 +594,8 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_discard.tpl:4
 #: personal/mail/sieve/templates/object_container.tpl:26
-#: personal/mail/sieve/class_sieveManagement.inc:498
-#: personal/mail/sieve/class_sieveManagement.inc:717
+#: personal/mail/sieve/class_sieveManagement.inc:497
+#: personal/mail/sieve/class_sieveManagement.inc:716
 msgid "Discard"
 msgstr ""
 
@@ -714,8 +605,8 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_require.tpl:12
 #: personal/mail/sieve/templates/object_container.tpl:29
-#: personal/mail/sieve/class_sieveManagement.inc:501
-#: personal/mail/sieve/class_sieveManagement.inc:720
+#: personal/mail/sieve/class_sieveManagement.inc:500
+#: personal/mail/sieve/class_sieveManagement.inc:719
 msgid "Require"
 msgstr ""
 
@@ -741,31 +632,31 @@ msgid "Fileinto"
 msgstr ""
 
 #: personal/mail/sieve/templates/object_container.tpl:28
-#: personal/mail/sieve/class_sieveManagement.inc:500
-#: personal/mail/sieve/class_sieveManagement.inc:719
+#: 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:504
-#: personal/mail/sieve/class_sieveManagement.inc:723
+#: 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:563
-#: personal/mail/sieve/class_sieveManagement.inc:758
+#: 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:565
-#: personal/mail/sieve/class_sieveManagement.inc:760
-#: personal/mail/sieve/class_sieveManagement.inc:765
+#: 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 ""
@@ -817,16 +708,6 @@ msgstr ""
 msgid "View source"
 msgstr ""
 
-#: personal/mail/sieve/templates/edit_frame_base.tpl:39
-#: personal/mail/sieve/templates/management.tpl:24
-#: admin/systems/services/virus/goVirusServer.tpl:168
-#: admin/systems/services/spam/goSpamServerRule.tpl:21
-#: admin/systems/services/spam/goSpamServer.tpl:125
-#: admin/systems/services/mail/goMailServer.tpl:221
-#: admin/systems/services/imap/goImapServer.tpl:116
-msgid "Save"
-msgstr ""
-
 #: personal/mail/sieve/templates/management.tpl:1
 msgid "List of sieve scripts"
 msgstr ""
@@ -839,7 +720,7 @@ msgstr ""
 
 #: personal/mail/sieve/templates/management.tpl:6
 msgid ""
-"Please verfiy that the attributes uid and mail are not empty and try again."
+"Please verify that the attributes uid and mail are not empty and try again."
 msgstr ""
 
 #: personal/mail/sieve/templates/management.tpl:12
@@ -881,14 +762,6 @@ msgid ""
 "'Cancel' to abort."
 msgstr ""
 
-#: personal/mail/sieve/templates/remove_script.tpl:14
-#: personal/mail/generic.tpl:80 personal/mail/generic.tpl:288
-#: personal/mail/copypaste.tpl:45 personal/mail/copypaste.tpl:62
-#: admin/groups/mail/paste_mail.tpl:31 admin/groups/mail/paste_mail.tpl:43
-#: admin/groups/mail/mail.tpl:122 admin/groups/mail/mail.tpl:211
-msgid "Delete"
-msgstr ""
-
 #: personal/mail/sieve/templates/element_fileinto.tpl:4
 msgid "Move mail into folder"
 msgstr ""
@@ -907,7 +780,7 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_envelope.tpl:16
 #: personal/mail/sieve/templates/element_envelope.tpl:105
-#: personal/mail/sieve/class_sieveManagement.inc:592
+#: personal/mail/sieve/class_sieveManagement.inc:591
 msgid "Envelope"
 msgstr ""
 
@@ -918,7 +791,7 @@ msgstr ""
 
 #: personal/mail/sieve/templates/element_address.tpl:15
 #: personal/mail/sieve/templates/element_address.tpl:113
-#: personal/mail/sieve/class_sieveManagement.inc:590
+#: personal/mail/sieve/class_sieveManagement.inc:589
 msgid "Address"
 msgstr ""
 
@@ -927,7 +800,7 @@ msgid "Part of address that should be used"
 msgstr ""
 
 #: personal/mail/sieve/templates/element_exists.tpl:8
-#: personal/mail/sieve/class_sieveManagement.inc:594
+#: personal/mail/sieve/class_sieveManagement.inc:593
 msgid "Exists"
 msgstr ""
 
@@ -964,48 +837,48 @@ msgid "Alternative sender address must be a valid email addresses."
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:114
-#: personal/mail/sieve/class_sieveManagement.inc:241
+#: personal/mail/sieve/class_sieveManagement.inc:242
 msgid "Parse failed"
 msgstr ""
 
 #: personal/mail/sieve/class_sieveManagement.inc:118
-#: personal/mail/sieve/class_sieveManagement.inc:245
+#: personal/mail/sieve/class_sieveManagement.inc:246
 msgid "Parse successful"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:155
+#: 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/class_sieveManagement.inc:200
+#: personal/mail/sieve/class_sieveManagement.inc:201
 msgid "No script name specified!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:205
+#: personal/mail/sieve/class_sieveManagement.inc:206
 msgid "Please use only lowercase script names!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:211
+#: personal/mail/sieve/class_sieveManagement.inc:212
 msgid "Please use only alphabetical characters in script names!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:217
+#: personal/mail/sieve/class_sieveManagement.inc:218
 msgid "Script name already in use!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:301
-#: personal/mail/sieve/class_sieveManagement.inc:308
-#: personal/mail/sieve/class_sieveManagement.inc:344
-#: personal/mail/sieve/class_sieveManagement.inc:348
-#: personal/mail/sieve/class_sieveManagement.inc:399
-#: personal/mail/sieve/class_sieveManagement.inc:403
-#: personal/mail/sieve/class_sieveManagement.inc:434
-#: personal/mail/sieve/class_sieveManagement.inc:520
-#: personal/mail/sieve/class_sieveManagement.inc:772
-#: personal/mail/sieve/class_sieveManagement.inc:1032
-#: personal/mail/sieve/class_sieveManagement.inc:1045
+#: 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
@@ -1013,114 +886,109 @@ msgstr ""
 msgid "SIEVE error"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:301
-#: personal/mail/sieve/class_sieveManagement.inc:344
-#: personal/mail/sieve/class_sieveManagement.inc:1032
+#: 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/class_sieveManagement.inc:308
+#: 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/class_sieveManagement.inc:348
+#: personal/mail/sieve/class_sieveManagement.inc:349
 #, php-format
 msgid "Cannot remove SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:360
-#, php-format
-msgid "You are going to remove the sieve script '%s' from your mail server."
-msgstr ""
-
-#: personal/mail/sieve/class_sieveManagement.inc:396
+#: personal/mail/sieve/class_sieveManagement.inc:395
 msgid "Edited"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:430
+#: personal/mail/sieve/class_sieveManagement.inc:429
 msgid "Uploaded script is empty!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:432
+#: 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/class_sieveManagement.inc:432
+#: personal/mail/sieve/class_sieveManagement.inc:431
 #, php-format
 msgid "Cannot access temporary file '%s'!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:434
+#: personal/mail/sieve/class_sieveManagement.inc:433
 #, php-format
 msgid "Cannot open temporary file '%s'!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:496
-#: personal/mail/sieve/class_sieveManagement.inc:715
+#: personal/mail/sieve/class_sieveManagement.inc:495
+#: personal/mail/sieve/class_sieveManagement.inc:714
 msgid "File into"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:520
+#: personal/mail/sieve/class_sieveManagement.inc:519
 msgid "Cannot add new element!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:597
+#: personal/mail/sieve/class_sieveManagement.inc:596
 #: personal/mail/sieve/class_sieveElement_If.inc:915
 msgid "True"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:598
+#: personal/mail/sieve/class_sieveManagement.inc:597
 #: personal/mail/sieve/class_sieveElement_If.inc:915
 msgid "False"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:635
-#: addons/mailqueue/contents.tpl:76 addons/mailqueue/class_mailqueue.inc:380
+#: personal/mail/sieve/class_sieveManagement.inc:634
+#: addons/mailqueue/contents.tpl:76 addons/mailqueue/class_mailqueue.inc:391
 msgid "Active"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:636
+#: personal/mail/sieve/class_sieveManagement.inc:635
 msgid "This script is marked as active"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:641
+#: personal/mail/sieve/class_sieveManagement.inc:640
 msgid "Script length"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:645
+#: personal/mail/sieve/class_sieveManagement.inc:644
 msgid "Remove script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:654
+#: personal/mail/sieve/class_sieveManagement.inc:653
 msgid "Activate script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:658
+#: personal/mail/sieve/class_sieveManagement.inc:657
 msgid "Edit script"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:673
+#: personal/mail/sieve/class_sieveManagement.inc:672
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:772
+#: personal/mail/sieve/class_sieveManagement.inc:771
 msgid "Cannot insert element at the requested position!"
 msgstr ""
 
-#: personal/mail/sieve/class_sieveManagement.inc:1045
+#: 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_sieveManagement.inc:1047
+#: personal/mail/sieve/class_sieveManagement.inc:1046
 msgid "Failed to save sieve script"
 msgstr ""
 
@@ -1130,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:677
+#: admin/groups/mail/class_groupMail.inc:683
 msgid "Default"
 msgstr ""
 
@@ -1425,14 +1293,6 @@ msgstr ""
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/main.inc:104
-msgid "Ok"
-msgstr ""
-
-#: personal/mail/main.inc:114
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
 #: personal/mail/main.inc:126
 msgid "User mail settings"
 msgstr ""
@@ -1480,10 +1340,6 @@ msgstr ""
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
 
-#: addons/mailqueue/header.tpl:5
-msgid "Back"
-msgstr ""
-
 #: addons/mailqueue/contents.tpl:10 addons/mailqueue/contents.tpl:26
 msgid "Search"
 msgstr ""
@@ -1516,7 +1372,7 @@ msgstr ""
 msgid "Remove all messages from selected servers queue"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:31 addons/mailqueue/class_mailqueue.inc:400
+#: addons/mailqueue/contents.tpl:31 addons/mailqueue/class_mailqueue.inc:411
 msgid "Hold all messages"
 msgstr ""
 
@@ -1532,7 +1388,7 @@ msgstr ""
 msgid "Release all messages in selected servers queue"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:35 addons/mailqueue/class_mailqueue.inc:402
+#: addons/mailqueue/contents.tpl:35 addons/mailqueue/class_mailqueue.inc:413
 msgid "Requeue all messages"
 msgstr ""
 
@@ -1580,7 +1436,7 @@ msgstr ""
 msgid "hold"
 msgstr ""
 
-#: addons/mailqueue/contents.tpl:102 addons/mailqueue/class_mailqueue.inc:404
+#: addons/mailqueue/contents.tpl:102 addons/mailqueue/class_mailqueue.inc:415
 msgid "Hold message"
 msgstr ""
 
@@ -1601,108 +1457,102 @@ msgid "Display header from this message"
 msgstr ""
 
 #: 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:64
+#: addons/mailqueue/class_mailqueue.inc:67
 #, php-format
 msgid "Missing '%s' directive in configuration!"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:91
-#: addons/mailqueue/class_mailqueue.inc:118
-#: addons/mailqueue/class_mailqueue.inc:177
-#: addons/mailqueue/class_mailqueue.inc:205
+#: 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:99
-#: addons/mailqueue/class_mailqueue.inc:127
-#: addons/mailqueue/class_mailqueue.inc:187
-#: addons/mailqueue/class_mailqueue.inc:220
+#: 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: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:232
-msgid "No mail servers sepcified!"
+#: addons/mailqueue/class_mailqueue.inc:243
+msgid "No mail servers specified!"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:282
+#: addons/mailqueue/class_mailqueue.inc:293
 msgid "up"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:284
+#: addons/mailqueue/class_mailqueue.inc:295
 msgid "down"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:312
-#: addons/mailqueue/class_mailqueue.inc:377
+#: addons/mailqueue/class_mailqueue.inc:323
+#: addons/mailqueue/class_mailqueue.inc:388
 msgid "All"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:327
+#: addons/mailqueue/class_mailqueue.inc:338
 msgid "no limit"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:330
+#: addons/mailqueue/class_mailqueue.inc:341
 msgid "hour"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:332
+#: addons/mailqueue/class_mailqueue.inc:343
 msgid "hours"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:378
+#: addons/mailqueue/class_mailqueue.inc:389
 msgid "Hold"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:379
+#: addons/mailqueue/class_mailqueue.inc:390
 msgid "Un hold"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:381
+#: addons/mailqueue/class_mailqueue.inc:392
 msgid "Not active"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:390
-msgid "Mailqueue"
-msgstr ""
-
-#: addons/mailqueue/class_mailqueue.inc:391
-msgid "Mailqueue addon"
-msgstr ""
-
-#: addons/mailqueue/class_mailqueue.inc:396
-msgid "Mail queue addon"
-msgstr ""
-
-#: addons/mailqueue/class_mailqueue.inc:399
+#: addons/mailqueue/class_mailqueue.inc:410
 msgid "Unhold all messages"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:401
+#: addons/mailqueue/class_mailqueue.inc:412
 msgid "Delete all messages"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:403
+#: addons/mailqueue/class_mailqueue.inc:414
 msgid "Unhold message"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:405
+#: addons/mailqueue/class_mailqueue.inc:416
 msgid "Delete message"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:406
+#: addons/mailqueue/class_mailqueue.inc:417
 msgid "Requeue message"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:407
+#: addons/mailqueue/class_mailqueue.inc:418
 msgid "Gathering queue data"
 msgstr ""
 
-#: addons/mailqueue/class_mailqueue.inc:408
+#: addons/mailqueue/class_mailqueue.inc:419
 msgid "Get header information"
 msgstr ""
 
@@ -1710,36 +1560,27 @@ msgstr ""
 msgid "Please enter a mail address"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:51
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-
-#: admin/ogroups/mail/class_mailogroup.inc:53
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-
-#: admin/ogroups/mail/class_mailogroup.inc:85
-msgid "Please enter a valid email address in 'Primary address' field."
+#: 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:92
-#: admin/groups/mail/class_groupMail.inc:1030
-msgid "The primary address you've entered is already in use."
+#: admin/ogroups/mail/class_mailogroup.inc:51
+#: admin/ogroups/mail/class_mailogroup.inc:54
+msgid "mail group"
 msgstr ""
 
-#: admin/ogroups/mail/class_mailogroup.inc:118
-#, php-format
-msgid "Saving of object group/mail with dn '%s' failed."
+#: 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:153
-#, php-format
-msgid "Removing of object group/mail with dn '%s' failed."
+#: 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:182
+#: admin/ogroups/mail/class_mailogroup.inc:187
 msgid "Mail group"
 msgstr ""
 
@@ -1756,25 +1597,25 @@ msgid "Generic virus filtering"
 msgstr ""
 
 #: admin/systems/services/virus/goVirusServer.tpl:13
-#: admin/systems/services/virus/class_goVirusServer.inc:174
+#: 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:174
-#: admin/systems/services/virus/class_goVirusServer.inc:241
+#: 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:174
-#: admin/systems/services/virus/class_goVirusServer.inc:243
+#: 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:162
-#: admin/systems/services/virus/class_goVirusServer.inc:235
+#: admin/systems/services/virus/class_goVirusServer.inc:164
+#: admin/systems/services/virus/class_goVirusServer.inc:237
 msgid "Maximum threads"
 msgstr ""
 
@@ -1787,18 +1628,18 @@ msgid "Max directory recursions"
 msgstr ""
 
 #: admin/systems/services/virus/goVirusServer.tpl:71
-#: admin/systems/services/virus/class_goVirusServer.inc:166
-#: admin/systems/services/virus/class_goVirusServer.inc:242
+#: 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:230
+#: 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:231
+#: admin/systems/services/virus/class_goVirusServer.inc:233
 msgid "Enable mail scanning"
 msgstr ""
 
@@ -1807,18 +1648,18 @@ msgid "Archive scanning"
 msgstr ""
 
 #: admin/systems/services/virus/goVirusServer.tpl:117
-#: admin/systems/services/virus/class_goVirusServer.inc:232
+#: 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:233
+#: 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:163
-#: admin/systems/services/virus/class_goVirusServer.inc:238
+#: admin/systems/services/virus/class_goVirusServer.inc:165
+#: admin/systems/services/virus/class_goVirusServer.inc:240
 msgid "Maximum file size"
 msgstr ""
 
@@ -1827,61 +1668,46 @@ msgid "Maximum recursion"
 msgstr ""
 
 #: admin/systems/services/virus/goVirusServer.tpl:152
-#: admin/systems/services/virus/class_goVirusServer.inc:165
-#: admin/systems/services/virus/class_goVirusServer.inc:240
+#: 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:208
-#: admin/systems/services/virus/class_goVirusServer.inc:217
-#: admin/systems/services/virus/class_goVirusServer.inc:218
+#: 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:153
-#, php-format
-msgid "Saving of server services/anti virus with dn '%s' failed."
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:161
-#: admin/systems/services/virus/class_goVirusServer.inc:236
+#: 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:164
-#: admin/systems/services/virus/class_goVirusServer.inc:239
+#: 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:170
-#, php-format
-msgid "The specified value for '%s' must be a numeric value."
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:176
-#, php-format
-msgid "Please specify a valid value for '%s'."
-msgstr ""
-
-#: admin/systems/services/virus/class_goVirusServer.inc:218
-#: admin/systems/services/spam/class_goSpamServer.inc:320
-#: admin/systems/services/mail/class_goMailServer.inc:702
-#: admin/systems/services/imap/class_goImapServer.inc:159
+#: 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 ""
 
-#: admin/systems/services/virus/class_goVirusServer.inc:226
-#: admin/systems/services/imap/class_goImapServer.inc:168
+#: admin/systems/services/virus/class_goVirusServer.inc:228
+#: admin/systems/services/imap/class_goImapServer.inc:206
 msgid "Start"
 msgstr ""
 
-#: admin/systems/services/virus/class_goVirusServer.inc:228
-#: admin/systems/services/imap/class_goImapServer.inc:170
+#: admin/systems/services/virus/class_goVirusServer.inc:230
+#: admin/systems/services/imap/class_goImapServer.inc:208
 msgid "Restart"
 msgstr ""
 
-#: admin/systems/services/virus/class_goVirusServer.inc:237
+#: admin/systems/services/virus/class_goVirusServer.inc:239
 msgid "Anti virus user"
 msgstr ""
 
@@ -1894,12 +1720,12 @@ msgid "Rule"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:8
-#: admin/systems/services/spam/class_goSpamServer.inc:328
+#: admin/systems/services/spam/class_goSpamServer.inc:330
 msgid "Rewrite header"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:18
-#: admin/systems/services/spam/class_goSpamServer.inc:330
+#: admin/systems/services/spam/class_goSpamServer.inc:332
 msgid "Required score"
 msgstr ""
 
@@ -1910,12 +1736,12 @@ msgstr ""
 #: 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:631
+#: admin/groups/mail/class_groupMail.inc:627
 msgid "Remove"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:69
-#: admin/systems/services/spam/class_goSpamServer.inc:333
+#: admin/systems/services/spam/class_goSpamServer.inc:335
 msgid "Enable use of bayes filtering"
 msgstr ""
 
@@ -1924,59 +1750,54 @@ msgid "Enable bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:75
-#: admin/systems/services/spam/class_goSpamServer.inc:335
+#: admin/systems/services/spam/class_goSpamServer.inc:337
 msgid "Enable RBL checks"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:86
-#: admin/systems/services/spam/class_goSpamServer.inc:336
+#: admin/systems/services/spam/class_goSpamServer.inc:338
 msgid "Enable use of Razor"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:89
-#: admin/systems/services/spam/class_goSpamServer.inc:337
+#: admin/systems/services/spam/class_goSpamServer.inc:339
 msgid "Enable use of DDC"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServer.tpl:92
-#: admin/systems/services/spam/class_goSpamServer.inc:338
+#: admin/systems/services/spam/class_goSpamServer.inc:340
 msgid "Enable use of Pyzor"
 msgstr ""
 
 #: admin/systems/services/spam/class_goSpamServer.inc:42
-#: admin/systems/services/spam/class_goSpamServer.inc:319
-#: admin/systems/services/spam/class_goSpamServer.inc:320
-#: admin/systems/services/spam/class_goSpamServer.inc:346
+#: 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 "Specified value is not a valid 'trusted network' value."
+msgid "Trusted network"
 msgstr ""
 
-#: admin/systems/services/spam/class_goSpamServer.inc:277
-#, php-format
-msgid "Saving of server services/spamassassin with dn '%s' failed."
+#: admin/systems/services/spam/class_goSpamServer.inc:288
+msgid "Score"
 msgstr ""
 
-#: admin/systems/services/spam/class_goSpamServer.inc:286
-msgid "Required score must be a numeric value."
-msgstr ""
-
-#: admin/systems/services/spam/class_goSpamServer.inc:329
+#: admin/systems/services/spam/class_goSpamServer.inc:331
 msgid "Trusted networks"
 msgstr ""
 
-#: admin/systems/services/spam/class_goSpamServer.inc:331
+#: admin/systems/services/spam/class_goSpamServer.inc:333
 msgid "Rules"
 msgstr ""
 
-#: admin/systems/services/spam/class_goSpamServer.inc:334
+#: admin/systems/services/spam/class_goSpamServer.inc:336
 msgid "Enabled bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:7
-#: admin/systems/services/mail/class_goMailServer.inc:710
+#: admin/systems/services/mail/class_goMailServer.inc:709
 msgid "Visible full qualified hostname"
 msgstr ""
 
@@ -1999,7 +1820,7 @@ msgid "KB"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:26
-#: admin/systems/services/mail/class_goMailServer.inc:713
+#: admin/systems/services/mail/class_goMailServer.inc:712
 msgid "Max mailbox size"
 msgstr ""
 
@@ -2008,7 +1829,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:35
-#: admin/systems/services/mail/class_goMailServer.inc:714
+#: admin/systems/services/mail/class_goMailServer.inc:713
 msgid "Max message size"
 msgstr ""
 
@@ -2017,7 +1838,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:45
-#: admin/systems/services/mail/class_goMailServer.inc:717
+#: admin/systems/services/mail/class_goMailServer.inc:716
 msgid "Relay host"
 msgstr ""
 
@@ -2026,7 +1847,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:60
-#: admin/systems/services/mail/class_goMailServer.inc:716
+#: admin/systems/services/mail/class_goMailServer.inc:715
 msgid "Local networks"
 msgstr ""
 
@@ -2039,7 +1860,7 @@ msgid "Domains and routing"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:91
-#: admin/systems/services/mail/class_goMailServer.inc:715
+#: admin/systems/services/mail/class_goMailServer.inc:714
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -2060,7 +1881,7 @@ msgid "Restrictions"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:149
-#: admin/systems/services/mail/class_goMailServer.inc:719
+#: admin/systems/services/mail/class_goMailServer.inc:718
 msgid "Restrictions for sender"
 msgstr ""
 
@@ -2070,7 +1891,7 @@ msgid "Restriction filter"
 msgstr ""
 
 #: admin/systems/services/mail/goMailServer.tpl:175
-#: admin/systems/services/mail/class_goMailServer.inc:720
+#: admin/systems/services/mail/class_goMailServer.inc:719
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -2104,93 +1925,92 @@ msgstr ""
 msgid "Mail smtp service (Postfix)"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:581
-#, php-format
-msgid "Saving server services/mail with dn '%s' failed."
-msgstr ""
-
-#: admin/systems/services/mail/class_goMailServer.inc:598
-msgid "Please specify a numeric value for header size limit."
+#: 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:602
-msgid "Please specify a numeric value for mailbox size limit."
+#: admin/systems/services/mail/class_goMailServer.inc:603
+msgid "Mailbox size limit"
 msgstr ""
 
 #: admin/systems/services/mail/class_goMailServer.inc:606
-msgid "Please specify a numeric value for message size limit."
+msgid "Message size limit"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:701
+#: admin/systems/services/mail/class_goMailServer.inc:700
 msgid "Mail smtp (Postfix)"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:702
+#: admin/systems/services/mail/class_goMailServer.inc:701
 msgid "Mail smtp - Postfix"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:711
+#: admin/systems/services/mail/class_goMailServer.inc:710
 msgid "Description"
 msgstr ""
 
-#: admin/systems/services/mail/class_goMailServer.inc:712
-msgid "Header size limit"
-msgstr ""
-
-#: admin/systems/services/mail/class_goMailServer.inc:718
+#: 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:173
+#: admin/systems/services/imap/class_goImapServer.inc:110
+#: admin/systems/services/imap/class_goImapServer.inc:211
 msgid "Server identifier"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:16
-#: admin/systems/services/imap/class_goImapServer.inc:174
+#: admin/systems/services/imap/class_goImapServer.inc:113
+#: admin/systems/services/imap/class_goImapServer.inc:115
+#: admin/systems/services/imap/class_goImapServer.inc:212
 msgid "Connect URL"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:25
-#: admin/systems/services/imap/class_goImapServer.inc:175
+#: admin/systems/services/imap/class_goImapServer.inc:126
+#: admin/systems/services/imap/class_goImapServer.inc:213
 msgid "Admin user"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:34
+#: admin/systems/services/imap/class_goImapServer.inc:129
 msgid "Password"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:43
-#: admin/systems/services/imap/class_goImapServer.inc:177
-msgid "Sieve port"
+#: admin/systems/services/imap/class_goImapServer.inc:119
+#: admin/systems/services/imap/class_goImapServer.inc:121
+#: admin/systems/services/imap/class_goImapServer.inc:216
+msgid "Sieve connect URL"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:61
-#: admin/systems/services/imap/class_goImapServer.inc:178
+#: admin/systems/services/imap/class_goImapServer.inc:217
 msgid "Start IMAP service"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:70
-#: admin/systems/services/imap/class_goImapServer.inc:179
+#: admin/systems/services/imap/class_goImapServer.inc:218
 msgid "Start IMAP SSL service"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:79
-#: admin/systems/services/imap/class_goImapServer.inc:180
+#: admin/systems/services/imap/class_goImapServer.inc:219
 msgid "Start POP3 service"
 msgstr ""
 
 #: admin/systems/services/imap/goImapServer.tpl:88
-#: admin/systems/services/imap/class_goImapServer.inc:181
+#: admin/systems/services/imap/class_goImapServer.inc:220
 msgid "Start POP3 SSL service"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:49
+#: admin/systems/services/imap/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:54
-#: admin/systems/services/imap/class_goImapServer.inc:171
+#: admin/systems/services/imap/class_goImapServer.inc:53
+#: admin/systems/services/imap/class_goImapServer.inc:209
 msgid "Repair database"
 msgstr ""
 
@@ -2198,37 +2018,17 @@ msgstr ""
 msgid "IMAP/POP3 (Cyrus) service"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:110
-msgid "Please specify a server identifier."
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:113
-msgid "Please specify a connect url."
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:116
-msgid "Please specify an admin user."
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:119
-msgid "Please specify a password for the admin user."
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:124
+#: admin/systems/services/imap/class_goImapServer.inc:122
 #, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: admin/systems/services/imap/class_goImapServer.inc:128
-msgid "The sieve port needs to be numeric."
+msgid "Valid options are: %s"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:158
-#: admin/systems/services/imap/class_goImapServer.inc:159
+#: admin/systems/services/imap/class_goImapServer.inc:196
+#: admin/systems/services/imap/class_goImapServer.inc:197
 msgid "IMAP/POP3"
 msgstr ""
 
-#: admin/systems/services/imap/class_goImapServer.inc:176
+#: admin/systems/services/imap/class_goImapServer.inc:214
 msgid "Admin password"
 msgstr ""
 
@@ -2264,7 +2064,7 @@ msgstr ""
 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 ""
 
@@ -2298,7 +2098,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:82
 #, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgid "Cannot locate mail method '%s'!"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:298
@@ -2329,127 +2129,108 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:356
-msgid "This 'dn' has no valid mail extensions."
+#: admin/groups/mail/class_groupMail.inc:355
+#: admin/groups/mail/class_groupMail.inc:364
+#: admin/groups/mail/class_groupMail.inc:367
+msgid "mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:378
+#: admin/groups/mail/class_groupMail.inc:377
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:379
+#: admin/groups/mail/class_groupMail.inc:378
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:439
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
+#: admin/groups/mail/class_groupMail.inc:437
+msgid "forward address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:445
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
+#: admin/groups/mail/class_groupMail.inc:441
+msgid "Cannot forward to users own mail address!"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:471
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
+#: admin/groups/mail/class_groupMail.inc:467
+msgid "Alternate address"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:476
-msgid "The address you're trying to add is already used by user"
+#: admin/groups/mail/class_groupMail.inc:621
+msgid "Add"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:667
 #: admin/groups/mail/class_groupMail.inc:673
+#: admin/groups/mail/class_groupMail.inc:679
 msgid "Unspecified"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:667
+#: admin/groups/mail/class_groupMail.inc:673
 msgid "Mails"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:668
+#: admin/groups/mail/class_groupMail.inc:674
 msgid "Tasks"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:668
+#: admin/groups/mail/class_groupMail.inc:674
 msgid "Journals"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:669
+#: admin/groups/mail/class_groupMail.inc:675
 msgid "Calendar"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:669
+#: admin/groups/mail/class_groupMail.inc:675
 msgid "Contacts"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:670
+#: admin/groups/mail/class_groupMail.inc:676
 msgid "Notes"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:673
+#: admin/groups/mail/class_groupMail.inc:679
 msgid "Inbox"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:674
+#: admin/groups/mail/class_groupMail.inc:680
 msgid "Drafts"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:674
+#: admin/groups/mail/class_groupMail.inc:680
 msgid "Sent items"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:675
+#: admin/groups/mail/class_groupMail.inc:681
 msgid "Junk mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:754
-#, php-format
-msgid "Removing of groups/mail with dn '%s' failed."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:986
-#, php-format
-msgid "Saving of groups/mail with dn '%s' failed."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1021
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1024
-msgid "Please enter a valid email addres in 'Primary address' field."
-msgstr ""
-
-#: admin/groups/mail/class_groupMail.inc:1053
+#: 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:1057
+#: 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:1061
-msgid "Please select a valid mail server."
+#: admin/groups/mail/class_groupMail.inc:1249
+msgid "Group mail"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1220
-msgid "Group mail"
+#: admin/groups/mail/class_groupMail.inc:1259
+msgid "Kolab"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1228
+#: admin/groups/mail/class_groupMail.inc:1260
 msgid "Alternate addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1229
+#: admin/groups/mail/class_groupMail.inc:1261
 msgid "Forwarding addresses"
 msgstr ""
 
-#: admin/groups/mail/class_groupMail.inc:1232
+#: admin/groups/mail/class_groupMail.inc:1262
 msgid "Permissions"
 msgstr ""