Added diffrent pictures if department is empty .. or contains another dep..

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 3bdc7a0e9e725e65d16447408335b0e4a0fd72b6..1a66d9856b8e2b25520df3ba9034552c14147714 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -41,9 +41,8 @@ msgstr ""
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:61
+#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
-#: plugins/personal/connectivity/main.inc:136
 msgid "Connectivity"
 msgstr ""
 
@@ -57,9 +56,9 @@ msgstr ""
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:41
 #: plugins/addons/addressbook/address_edit.tpl:89
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/departments/generic.tpl:58
@@ -116,55 +115,178 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:150 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:151 plugins/personal/mail/generic.tpl:111
+#: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:111
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:152
+#: contrib/gosa.conf:153
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:168
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:192
 msgid "Italian"
 msgstr ""
 
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:30
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/blocklists/headpage.tpl:58
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/admin/groups/headpage.tpl:66
+#: plugins/admin/groups/group_objects.tpl:27
+#: plugins/admin/groups/mail_locals.tpl:33 plugins/admin/users/headpage.tpl:68
+#: plugins/admin/applications/headpage.tpl:49
+#: plugins/admin/departments/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:62 plugins/admin/ogroups/headpage.tpl:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/gofon/macro/headpage.tpl:49
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
+msgid "Regular expression for matching addresses"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/samba/samba3.tpl:287
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95 plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/gofon/phoneaccount/generic.tpl:11
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
+msgid "Add"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:108
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:261
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:509
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:241
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:230
+#: plugins/admin/systems/class_systemManagement.inc:442
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:272
+#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
+#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
@@ -202,66 +324,35 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
-#: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
-#: plugins/gofon/phoneaccount/generic.tpl:11
-msgid "Add"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
 #: plugins/personal/samba/samba3.tpl:289
 #: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:18
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
+#: plugins/addons/addressbook/remove.tpl:15
+#: plugins/admin/groups/headpage.tpl:18 plugins/admin/groups/mail.tpl:55
 #: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/headpage.tpl:18 plugins/admin/groups/generic.tpl:90
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
-#: plugins/admin/applications/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:90 plugins/admin/users/headpage.tpl:19
+#: plugins/admin/users/remove.tpl:15
 #: plugins/admin/applications/headpage.tpl:18
-#: plugins/admin/departments/remove.tpl:15
+#: plugins/admin/applications/remove.tpl:14
 #: plugins/admin/departments/headpage.tpl:18
+#: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
-#: plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/headpage.tpl:17 plugins/admin/systems/remove.tpl:15
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 plugins/admin/ogroups/headpage.tpl:18
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/headpage.tpl:18
-#: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/macro/headpage.tpl:18
+#: plugins/gofon/macro/headpage.tpl:18 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Delete"
 msgstr ""
 
@@ -345,18 +436,63 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/users/class_userManagement.inc:507
+#: plugins/admin/applications/class_applicationManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:228
+#: plugins/admin/systems/class_systemManagement.inc:440
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
+#: plugins/gofon/phoneaccount/main.inc:104
+msgid "Finish"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
+#: plugins/personal/connectivity/main.inc:127
+#: plugins/gofax/blocklists/headpage.tpl:17
+#: plugins/gofax/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
+#: plugins/admin/applications/headpage.tpl:17
+#: plugins/admin/departments/headpage.tpl:17
+#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
+#: plugins/gofon/macro/headpage.tpl:17 plugins/gofon/phoneaccount/main.inc:112
+msgid "Edit"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr ""
+
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
 #: plugins/personal/samba/class_sambaAccount.inc:25
 #: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
 #: plugins/personal/connectivity/class_phpgwAccount.inc:6
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/reports/class_faxreport.inc:7
@@ -372,9 +508,9 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:26
 #: plugins/admin/systems/class_systemManagement.inc:33
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/reports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 msgid "This does something"
 msgstr ""
 
@@ -441,179 +577,75 @@ msgstr ""
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:675
+#: plugins/personal/mail/class_mailAccount.inc:684
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:680
+#: plugins/personal/mail/class_mailAccount.inc:689
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:684
-#: plugins/personal/mail/class_mailAccount.inc:688
+#: plugins/personal/mail/class_mailAccount.inc:693
+#: plugins/personal/mail/class_mailAccount.inc:697
 #: plugins/addons/addressbook/class_addressbook.inc:569
 #: plugins/admin/ogroups/class_mailogroup.inc:67
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:695
+#: plugins/personal/mail/class_mailAccount.inc:704
 #: plugins/admin/groups/class_groupMail.inc:619
 #: plugins/admin/ogroups/class_mailogroup.inc:74
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:701
+#: plugins/personal/mail/class_mailAccount.inc:710
 #: plugins/admin/groups/class_groupMail.inc:625
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:710
+#: plugins/personal/mail/class_mailAccount.inc:719
 #: plugins/admin/groups/class_groupMail.inc:634
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:720
+#: plugins/personal/mail/class_mailAccount.inc:729
 #: plugins/admin/groups/class_groupMail.inc:642
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/users/class_userManagement.inc:507
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:270
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
-msgid "Finish"
+#: plugins/personal/mail/class_mailAccount.inc:733
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:509
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:442
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:272
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/blocklists/headpage.tpl:17
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
-#: plugins/admin/applications/headpage.tpl:17
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/main.inc:112 plugins/gofon/macro/headpage.tpl:17
-msgid "Edit"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:30
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/blocklists/headpage.tpl:58
-#: plugins/gofax/faxaccount/locals.tpl:31
-#: plugins/addons/addressbook/contents.tpl:81
-#: plugins/admin/groups/headpage.tpl:66
-#: plugins/admin/groups/group_objects.tpl:27
-#: plugins/admin/groups/mail_locals.tpl:33 plugins/admin/users/headpage.tpl:68
-#: plugins/admin/applications/headpage.tpl:49
-#: plugins/admin/departments/headpage.tpl:47
-#: plugins/admin/systems/headpage.tpl:62
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
+#: plugins/personal/password/changed.tpl:2
+#: plugins/personal/password/password.tpl:2
+msgid "Change password"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
+#: plugins/personal/password/changed.tpl:6
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
+#: plugins/personal/password/changed.tpl:12
+#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1203
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_step3.tpl:17
+#: ihtml/themes/altlinux/setup_step4.tpl:114
+#: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:40
+#: ihtml/themes/default/setup_step2.tpl:12
+#: ihtml/themes/default/setup_step3.tpl:17
+#: ihtml/themes/default/setup_step4.tpl:114
+#: ihtml/themes/default/setup_finish.tpl:30
+msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
@@ -627,11 +659,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-msgid "Change password"
-msgstr ""
-
 #: plugins/personal/password/password.tpl:6
 msgid ""
 "To change your personal password use the fields below. The changes take "
@@ -664,7 +691,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/users/headpage.tpl:20 plugins/admin/users/password.tpl:21
 #: plugins/admin/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr ""
@@ -673,30 +700,6 @@ msgstr ""
 msgid "Clear fields"
 msgstr ""
 
-#: plugins/personal/password/changed.tpl:6
-msgid ""
-"You've successfully changed your password. Remember to change all programms "
-"configured to use it as well."
-msgstr ""
-
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
-#: ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:99
-#: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_step2.tpl:12
-#: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114
-#: ihtml/themes/default/setup_finish.tpl:30
-msgid "Back"
-msgstr ""
-
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -735,6 +738,65 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr ""
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr ""
@@ -748,9 +810,9 @@ msgstr ""
 #: plugins/admin/users/headpage.tpl:39
 #: plugins/admin/applications/headpage.tpl:37
 #: plugins/admin/departments/headpage.tpl:37
-#: plugins/admin/systems/headpage.tpl:37
+#: plugins/admin/systems/headpage.tpl:37 plugins/admin/ogroups/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:37
+#: plugins/gofon/macro/headpage.tpl:37
 msgid "Filters"
 msgstr ""
 
@@ -852,63 +914,8 @@ msgstr ""
 msgid "Display systems matching"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:626
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
@@ -917,7 +924,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:950
 msgid "Group of user"
 msgstr ""
 
@@ -987,7 +994,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -998,7 +1005,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1009,7 +1016,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1020,7 +1027,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1031,7 +1038,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1042,7 +1049,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1053,7 +1060,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1064,7 +1071,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1075,7 +1082,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1086,7 +1093,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1097,7 +1104,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1108,7 +1115,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
@@ -1135,77 +1142,73 @@ msgstr ""
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:876
+#: plugins/personal/posix/class_posixAccount.inc:880
 #: plugins/admin/groups/class_groupGeneric.inc:610
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:879
+#: plugins/personal/posix/class_posixAccount.inc:883
 #: plugins/admin/groups/class_groupGeneric.inc:613
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:897
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1021
+#: plugins/personal/posix/class_posixAccount.inc:1029
 #: plugins/admin/groups/class_groupGeneric.inc:644
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr ""
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1332,6 +1335,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1344,10 +1351,6 @@ msgstr ""
 msgid "Display workstations matching"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr ""
@@ -1440,38 +1443,159 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
 msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:107
-msgid "Save"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:526
+#: plugins/admin/users/class_userManagement.inc:425
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:530
+#: plugins/admin/users/class_userManagement.inc:428
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:536
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:539
+#: plugins/addons/addressbook/class_addressbook.inc:561
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:544
+#: plugins/addons/addressbook/class_addressbook.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:158
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:161
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:553
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:556
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr ""
+
 #: plugins/personal/generic/generic.tpl:17
 msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:20
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:20
 #: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
@@ -1517,9 +1641,9 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1602,8 +1726,8 @@ msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr ""
@@ -1680,6 +1804,30 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:107
+msgid "Save"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr ""
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1707,173 +1855,210 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "female"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "male"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:241
-msgid "This account has no valid GOsa extensions."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:270
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
-msgid "Please enter a valid serial number"
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+#: plugins/personal/connectivity/proxy.tpl:79
+msgid "per"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
-msgid "valid"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
-msgid "invalid"
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
-msgid "No certificate installed"
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:800
-msgid "Kerberos database communication failed"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:817
-msgid "Can't remove user from kerberos database."
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:828
-msgid "Can't add user to kerberos database."
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:868
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:873
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:879
-#: plugins/addons/addressbook/class_addressbook.inc:526
-#: plugins/admin/users/class_userManagement.inc:425
-msgid "The required field 'Name' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:888
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:428
-msgid "The required field 'Given name' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:897
-msgid "The required field 'Login' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:904
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:911
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:914
-msgid "The field 'Homepage' contains an invalid URL definition."
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:539
-#: plugins/addons/addressbook/class_addressbook.inc:561
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/addons/addressbook/class_addressbook.inc:544
-#: plugins/addons/addressbook/class_addressbook.inc:547
-#: plugins/admin/departments/class_departmentGeneric.inc:158
-msgid "The field 'Phone' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:931
-#: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/departments/class_departmentGeneric.inc:161
-msgid "The field 'Fax' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:553
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:937
-#: plugins/addons/addressbook/class_addressbook.inc:556
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1062
-msgid "Could not open specified certificate!"
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:79
-msgid "per"
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "KB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "GB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "hour"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "day"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "week"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
+msgid "Numerical value for Quota Setting is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
@@ -1933,10 +2118,6 @@ msgstr ""
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr ""
-
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
@@ -1962,10 +2143,6 @@ msgstr ""
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr ""
-
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr ""
@@ -1983,213 +2160,167 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:774
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
 msgid "Couldn't Connect To Postgresql Database"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:778
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
 msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:782
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
+#: plugins/gofax/blocklists/headpage.tpl:16
+#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
+#: plugins/admin/applications/headpage.tpl:16
+#: plugins/admin/departments/headpage.tpl:16
+#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
+#: plugins/gofon/macro/headpage.tpl:16
+msgid "New"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
+#: plugins/gofax/blocklists/headpage.tpl:25
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:26 plugins/admin/users/headpage.tpl:27
+#: plugins/admin/applications/headpage.tpl:25
+#: plugins/admin/departments/headpage.tpl:25
+#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:26
+#: plugins/gofon/macro/headpage.tpl:25
+msgid "Information"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
+#: plugins/gofax/blocklists/headpage.tpl:29
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
+#: plugins/gofax/blocklists/headpage.tpl:32
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you when performing "
+"changes on your blocklist. -Delete- will ask you for confirmation before "
+"really deleting anything."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/gofax/blocklists/headpage.tpl:55
+msgid "Display lists of department"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/gofax/blocklists/headpage.tpl:69
+msgid "Display lists matching"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/gofax/blocklists/headpage.tpl:72
+msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: plugins/gofax/blocklists/headpage.tpl:80
+msgid "Display lists containing"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/gofax/blocklists/headpage.tpl:83
+msgid "Show lists containing entered numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
+msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
+msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+msgid "send"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
-msgstr ""
-
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
-msgid "You have no permission to remove this blocklist."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
-msgid "Please specify a valid phone number."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "send"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "receive"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+msgid "receive"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:348
@@ -2213,63 +2344,6 @@ msgstr ""
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:25
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:26 plugins/admin/users/headpage.tpl:27
-#: plugins/admin/applications/headpage.tpl:25
-#: plugins/admin/departments/headpage.tpl:25
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:26
-#: plugins/gofon/macro/headpage.tpl:25
-msgid "Information"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr ""
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2296,69 +2370,6 @@ msgid ""
 "abort."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:16
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/macro/headpage.tpl:16
-msgid "New"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:29
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you when performing "
-"changes on your blocklist. -Delete- will ask you for confirmation before "
-"really deleting anything."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:46
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:46
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:47
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:47
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:55
-msgid "Display lists of department"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:69
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:72
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:80
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:83
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2463,7 +2474,7 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1195
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1194
 msgid "Apply"
 msgstr ""
 
@@ -2522,6 +2533,74 @@ msgstr ""
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+msgid ""
+"Deliver fax to printer, is only possible if valid printer is given. Please "
+"correct your choice."
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:92
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+msgid "Enter user name to search for"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
+#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+msgid "in"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+msgid "Select subtree to base search on"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+msgid "during"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+msgid "Search"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+msgid "User"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/reports/contents.tpl:30
+msgid "Date"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:33
+msgid "Sender"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:34
+msgid "Receiver"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr ""
+
+#: plugins/gofax/reports/contents.tpl:47
+#: plugins/addons/logview/contents.tpl:97
+#: plugins/gofon/reports/contents.tpl:48
+msgid "Search returned no results..."
+msgstr ""
+
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr ""
@@ -2534,10 +2613,6 @@ msgstr ""
 msgid "FAX ID"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-msgid "User"
-msgstr ""
-
 #: plugins/gofax/reports/detail.tpl:26
 msgid "Date / Time"
 msgstr ""
@@ -2566,9 +2641,9 @@ msgstr ""
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr ""
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr ""
 
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
@@ -2599,62 +2674,69 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:92
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
+#: plugins/addons/addressbook/contents.tpl:15
+msgid "Contact"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
-msgid "Enter user name to search for"
+#: plugins/addons/addressbook/contents.tpl:37
+msgid ""
+"The telephone list plugin provides list and search facilities for the people "
+"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
+"find 'Gonicus'. Use the filters below to narrow down your search."
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
-msgid "in"
+#: plugins/addons/addressbook/contents.tpl:42
+msgid "Actions"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
-msgid "Select subtree to base search on"
+#: plugins/addons/addressbook/contents.tpl:47
+msgid "Add entry"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
-msgid "during"
+#: plugins/addons/addressbook/contents.tpl:50
+msgid "Edit entry"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-msgid "Search"
+#: plugins/addons/addressbook/contents.tpl:52
+msgid "Remove entry"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
-msgid "Date"
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Select to see regular users"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:33
-msgid "Sender"
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Show organizational entries"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:34
-msgid "Receiver"
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Select to see users in addressbook"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
-msgid "Search returned no results..."
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Show addressbook entries"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/addons/addressbook/contents.tpl:78
+msgid "Display results for department"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:95
+msgid "Search string"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:103
+msgid "Match object"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:106
+msgid "Choose the object that will be searched in"
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:3
@@ -2669,6 +2751,13 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+
 #: plugins/addons/addressbook/address_edit.tpl:4
 msgid "Choose the department to store entry in"
 msgstr ""
@@ -2683,12 +2772,6 @@ msgstr ""
 msgid "Initials"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr ""
-
 #: plugins/addons/addressbook/address_edit.tpl:47
 #: plugins/addons/addressbook/address_info.tpl:43
 msgid "Email"
@@ -2714,72 +2797,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:15
-msgid "Contact"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:37
-msgid ""
-"The telephone list plugin provides list and search facilities for the people "
-"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
-"find 'Gonicus'. Use the filters below to narrow down your search."
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:42
-msgid "Actions"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:47
-msgid "Add entry"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:50
-msgid "Edit entry"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:52
-msgid "Remove entry"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Select to see regular users"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Show organizational entries"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Show addressbook entries"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:78
-msgid "Display results for department"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:95
-msgid "Search string"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:103
-msgid "Match object"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:106
-msgid "Choose the object that will be searched in"
-msgstr ""
-
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr ""
@@ -2868,6 +2885,11 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -2902,20 +2924,20 @@ msgstr ""
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:299
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
-#: plugins/addons/ldapmanager/class_csvimport.inc:315
-#: plugins/addons/ldapmanager/class_import.inc:58
-#: plugins/addons/ldapmanager/class_import.inc:66
+#: plugins/addons/ldapmanager/class_csvimport.inc:302
+#: plugins/addons/ldapmanager/class_csvimport.inc:313
+#: plugins/addons/ldapmanager/class_csvimport.inc:318
+#: plugins/addons/ldapmanager/class_import.inc:59
+#: plugins/addons/ldapmanager/class_import.inc:67
 msgid "There is no file uploaded."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:304
-#: plugins/addons/ldapmanager/class_import.inc:51
+#: plugins/addons/ldapmanager/class_csvimport.inc:307
+#: plugins/addons/ldapmanager/class_import.inc:52
 msgid "The specified file is empty."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:442
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -2984,7 +3006,7 @@ msgstr ""
 msgid "You've no permission to do LDAP imports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:104
+#: plugins/addons/ldapmanager/class_import.inc:105
 msgid "Unknown Error"
 msgstr ""
 
@@ -3024,11 +3046,6 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr ""
@@ -3041,6 +3058,10 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr ""
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr ""
@@ -3128,8 +3149,29 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:30
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you in editing group "
+"properties. -Delete- will ask for confirmation before removing groups."
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
+msgid "Dive into LDAP subtrees when searching"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
+msgid "Search in subtrees"
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11
@@ -3156,6 +3198,16 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
+#: plugins/admin/groups/remove.tpl:7
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr ""
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3216,99 +3268,76 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:30
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing group "
-"properties. -Delete- will ask for confirmation before removing groups."
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Dive into LDAP subtrees when searching"
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Search in subtrees"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:153
-msgid "read"
+#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
+msgid "Group name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:154
-msgid "post"
+#: plugins/admin/groups/generic.tpl:9
+msgid "Posix name of the group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:155
-msgid "external post"
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:156
-msgid "append"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:157
-msgid "write"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:179
-msgid "This 'dn' has no valid mail extensions."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:244
-msgid "You're trying to add an invalid email address "
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:245
-msgid "to the list of forwarders."
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
-msgid "Please enter a valid email addres in 'Primary address' field."
+#: plugins/admin/groups/generic.tpl:36
+msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
+#: plugins/admin/groups/generic.tpl:36
+msgid "Force GID"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: plugins/admin/groups/generic.tpl:38
+msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
+#: plugins/admin/groups/generic.tpl:45
+msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
+#: plugins/admin/groups/generic.tpl:50
+msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
+#: plugins/admin/groups/generic.tpl:66
+msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
+#: plugins/admin/groups/generic.tpl:81
+msgid "Group members"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:6
@@ -3338,54 +3367,6 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
-msgid "Group name"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:9
-msgid "Posix name of the group"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:36
-msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:36
-msgid "Force GID"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:38
-msgid "Forced ID number"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:45
-msgid "Select to create a samba conform group"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:50
-msgid "in domain"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:66
-msgid "Members are in a phone pickup group"
-msgstr ""
-
-#: plugins/admin/groups/generic.tpl:81
-msgid "Group members"
-msgstr ""
-
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr ""
-
 #: plugins/admin/groups/application_options.tpl:1
 msgid "Application options"
 msgstr ""
@@ -3422,74 +3403,49 @@ msgstr ""
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
-msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+#: plugins/admin/groups/class_groupMail.inc:153
+msgid "read"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
+#: plugins/admin/groups/class_groupMail.inc:154
+msgid "post"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:157
-#: plugins/admin/users/class_userManagement.inc:208
-msgid "You are not allowed to set this users password!"
+#: plugins/admin/groups/class_groupMail.inc:155
+msgid "external post"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:244
-#, php-format
-msgid "You're about to delete the user %s."
+#: plugins/admin/groups/class_groupMail.inc:156
+msgid "append"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:250
-#: plugins/admin/users/class_userManagement.inc:278
-msgid "You are not allowed to delete this user!"
+#: plugins/admin/groups/class_groupMail.inc:157
+msgid "write"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:368
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "none"
+#: plugins/admin/groups/class_groupMail.inc:179
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:437
-msgid "A person with the choosen name is already used in this tree."
+#: plugins/admin/groups/class_groupMail.inc:244
+msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:618
-#: plugins/admin/users/template.tpl:11
-msgid "Template"
+#: plugins/admin/groups/class_groupMail.inc:245
+msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
+#: plugins/admin/groups/class_groupMail.inc:646
 msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
+"Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/groups/class_groupMail.inc:650
+msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/users/headpage.tpl:6
@@ -3561,85 +3517,148 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/users/remove.tpl:7
 msgid ""
-"This application has options disabled. You can enable them by clicking below."
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
+#: plugins/admin/users/password.tpl:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
+#: plugins/admin/users/class_userManagement.inc:157
+#: plugins/admin/users/class_userManagement.inc:208
+msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
+#: plugins/admin/users/class_userManagement.inc:244
 #, php-format
-msgid "Value '%s' specified as option name is not valid."
+msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-msgid "Application name"
+#: plugins/admin/users/class_userManagement.inc:250
+#: plugins/admin/users/class_userManagement.inc:278
+msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
-#: plugins/admin/systems/workstation.tpl:109
-#: plugins/admin/ogroups/termgroup.tpl:13
-msgid "Execute"
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "none"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:14
-msgid "Path and/or binary name of application"
+#: plugins/admin/users/class_userManagement.inc:437
+msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:18
-#: plugins/gofon/macro/generic.tpl:10
-msgid "Display name"
+#: plugins/admin/users/class_userManagement.inc:618
+#: plugins/admin/users/template.tpl:11
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:20
-msgid "Application name to be displayed (i.e. below icons)"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:35
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place application in"
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:46
-msgid "Icon"
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:51
-msgid "Update"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:51
-msgid "Reload picture from LDAP"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:29
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:32
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you in editing "
+"properties. -Delete- will ask for confirmation before removing applications."
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:46
+msgid "Display applications of department"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:58
+msgid "Display applications matching"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:61
+msgid "Regular expression for matching application names"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+msgid "Application name"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:12
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
+#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/ogroups/termgroup.tpl:13
+msgid "Execute"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:14
+msgid "Path and/or binary name of application"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:18
+#: plugins/gofon/macro/generic.tpl:10
+msgid "Display name"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:20
+msgid "Application name to be displayed (i.e. below icons)"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:35
+msgid "Choose subtree to place application in"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:46
+msgid "Icon"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:51
+msgid "Update"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:51
+msgid "Reload picture from LDAP"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:61
@@ -3658,39 +3677,45 @@ msgstr ""
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
-msgid ""
-"This may be used by several groups. Please double check if your really want "
-"to do this since there is no way for GOsa to get your data back."
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:29
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:32
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing applications."
+"This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:46
-msgid "Display applications of department"
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:58
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:61
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
+#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
 #: plugins/admin/applications/main.inc:38
@@ -3729,10 +3754,39 @@ msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:191
 #: plugins/admin/applications/class_applicationManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:29
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:32
+msgid ""
+"-Edit- and -New...- will provide an assistant to aid you when performing "
+"changes on your departments. -Delete- will ask for confirmation before "
+"deleting departments."
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:45
+msgid "Display subdepartments of"
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:56
+msgid "Display departments matching"
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:59
+msgid "Regular expression for matching department names"
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3797,36 +3851,6 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:29
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will provide an assistant to aid you when performing "
-"changes on your departments. -Delete- will ask for confirmation before "
-"deleting departments."
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Display subdepartments of"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:56
-msgid "Display departments matching"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:59
-msgid "Regular expression for matching department names"
-msgstr ""
-
 #: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
 msgid "Department management"
 msgstr ""
@@ -3866,6 +3890,18 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -3902,42 +3938,36 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:134
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:148
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:158
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:292
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -4036,106 +4066,188 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "default"
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "show chooser"
+#: plugins/admin/systems/class_winGeneric.inc:134
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:85
-msgid "direct"
+#: plugins/admin/systems/class_winGeneric.inc:148
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:88
-msgid "load balanced"
+#: plugins/admin/systems/class_winGeneric.inc:158
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:91
-msgid "Windows RDP"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:92
-msgid "ICA client"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:184
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:179
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "show chooser"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:85
+msgid "direct"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:88
+msgid "load balanced"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:91
+msgid "Windows RDP"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:92
+msgid "ICA client"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:184
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
+msgid "Please specify a valid HSync range."
+msgstr ""
+
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:42
 msgid "Select action to execute for this server"
 msgstr ""
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4212,10 +4324,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
@@ -4228,70 +4336,6 @@ msgstr ""
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr ""
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr ""
@@ -4366,65 +4410,98 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid "Remove DNS service"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid "Add DNS service"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:34
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:37
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:6
@@ -4475,165 +4552,43 @@ msgstr ""
 msgid "Connect URL"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:104
-msgid "Logging DB user"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:88
-msgid "Remove Kolab extension"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:88
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:91
-msgid "Add Kolab service"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:91
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:119
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:125
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:197
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:203
-msgid "The given Quota settings value must be a number."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:205
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:207
-msgid "Future days must be a value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:211
-msgid "No SMTP privileged networks set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:215
-msgid "No SMTP smarthost/relayhost set."
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:136
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:142
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:147
-msgid "Host used to relay mails"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/servdb.tpl:104
+msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:167
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:6
@@ -4725,14 +4680,166 @@ msgstr ""
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:269
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/remove.tpl:7
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:272
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:212
+msgid "MSN"
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:4
@@ -4898,20 +5005,14 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:272
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
 #: plugins/admin/systems/chooser.tpl:1
@@ -4956,6 +5057,10 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr ""
+
 #: plugins/admin/systems/startup.tpl:1
 msgid "Boot parameters"
 msgstr ""
@@ -5070,85 +5175,74 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:64
-msgid "refresh"
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
+#: plugins/admin/ogroups/headpage.tpl:30
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/ogroups/headpage.tpl:48
+msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
+#: plugins/admin/ogroups/headpage.tpl:49
+msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/ogroups/headpage.tpl:50
+msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
+#: plugins/admin/ogroups/headpage.tpl:52
+msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
+#: plugins/admin/ogroups/headpage.tpl:53
+msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/ogroups/headpage.tpl:54
+msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/ogroups/headpage.tpl:55
+msgid "Show groups containing printers"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:212
-msgid "MSN"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -5219,17 +5313,6 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
-msgstr ""
-
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
@@ -5326,152 +5409,154 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr ""
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:30
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show groups containing users"
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:49
-msgid "Show groups containing groups"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:50
-msgid "Show groups containing applications"
+#: plugins/gofon/macro/headpage.tpl:29
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Show groups containing departments"
+#: plugins/gofon/macro/headpage.tpl:32
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you in editing "
+"properties. -Delete- will ask for confirmation before removing macros."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Show groups containing servers"
+#: plugins/gofon/macro/headpage.tpl:46
+msgid "Display macros of department"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:53
-msgid "Show groups containing workstations"
+#: plugins/gofon/macro/headpage.tpl:59
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:54
-msgid "Show groups containing terminals"
+#: plugins/gofon/macro/headpage.tpl:62
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:55
-msgid "Show groups containing printers"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
-msgid "no macro"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
-msgid "undefined"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:192
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
-msgid "This account has no phone extensions."
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
-msgid "Remove phone account"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
+#: plugins/gofon/macro/class_gofonMacro.inc:80
+msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
-msgid "Create phone account"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+msgid "String"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:232
+msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
-msgid "Choose your private phone"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:238
+msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:312
 #, php-format
-msgid "You need to specify at least one phone number!"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:320
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
 #, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:325
 #, php-format
-msgid "The given PIN is too short"
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
-#, php-format
-msgid "The number '%s' is no valid phone number!"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
+#: plugins/gofon/macro/class_gofonMacro.inc:161
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:319
+#: plugins/gofon/macro/class_gofonMacro.inc:166
+msgid "You must specify the 'Display Name' in order to save this macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:171
 #, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:180
+msgid "Makro length must be lower than 100 lines"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:185
+msgid "Please choose a valid  base."
 msgstr ""
 
 #: plugins/gofon/phoneaccount/generic.tpl:1
@@ -5501,168 +5586,120 @@ msgstr ""
 msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr ""
-
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:80
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:161
-#, php-format
-msgid "The given cn '%s' already exists."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:166
-msgid "You must specify the 'Display Name' in order to save this macro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:171
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:180
-msgid "Makro length must be lower than 100 lines"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
+msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
+msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
+msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:229
-msgid "String"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
-msgid "Combobox"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
+msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
-msgid "Bool"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:237
-msgid "Delete unused"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:29
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing macros."
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:46
-msgid "Display macros of department"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:59
-msgid "Display macros  matching"
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:62
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/reports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:192
-msgid "You are not allowed to delete this macro!"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:36
@@ -5715,6 +5752,30 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr ""
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -5769,87 +5830,87 @@ msgstr ""
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:313
+#: include/functions.inc:312
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:351
+#: include/functions.inc:350
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:361
+#: include/functions.inc:360
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:376
+#: include/functions.inc:375
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:402
+#: include/functions.inc:401
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:432
+#: include/functions.inc:431
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:442
+#: include/functions.inc:441
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:450
+#: include/functions.inc:449
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:522
+#: include/functions.inc:521
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:524
+#: include/functions.inc:523
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:536
+#: include/functions.inc:535
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:541
+#: include/functions.inc:540
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:924
+#: include/functions.inc:923
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1023
+#: include/functions.inc:1022
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1469
+#: include/functions.inc:1468
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1512
+#: include/functions.inc:1511
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -5917,19 +5978,19 @@ msgstr ""
 msgid "This is an empty plugin."
 msgstr ""
 
-#: include/class_plugin.inc:386
+#: include/class_plugin.inc:398
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:412 include/class_password-methods.inc:178
+#: include/class_plugin.inc:424 include/class_password-methods.inc:178
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:438
+#: include/class_plugin.inc:450
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -5939,20 +6000,6 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-
 #: include/class_password-methods.inc:162
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
@@ -5963,83 +6010,18 @@ msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr ""
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-
-#: include/class_config.inc:426
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr ""
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-
-#: include/class_ldap.inc:398
-#, php-format
+#: include/class_pluglist.inc:98
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_ldap.inc:631
-#, php-format
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:644
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:660
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr ""
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -6126,302 +6108,302 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:233
+#: include/functions_setup.inc:232
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:240
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:258
+#: include/functions_setup.inc:257
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:260
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:262
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:280
+#: include/functions_setup.inc:279
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:280
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:282
+#: include/functions_setup.inc:281
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:284
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:285
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:288
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:290
+#: include/functions_setup.inc:289
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:292
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:293
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:296
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:297
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:299
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:300
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:303
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:304
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:307
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:308
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:311
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:312
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:315
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:316
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:319
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:320
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:323
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:324
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:327
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:328
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:337
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:347
+#: include/functions_setup.inc:346
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:347
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:350
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:351
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:359
+#: include/functions_setup.inc:358
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:359
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:375
+#: include/functions_setup.inc:374
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:376
+#: include/functions_setup.inc:375
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:388
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:389
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:392
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:393
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:401
+#: include/functions_setup.inc:400
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:402
+#: include/functions_setup.inc:401
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:408
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:410
+#: include/functions_setup.inc:409
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:413
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:414
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:418
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:419
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:659
+#: include/functions_setup.inc:658
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:668 include/functions_setup.inc:750
+#: include/functions_setup.inc:667 include/functions_setup.inc:749
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:682 include/functions_setup.inc:755
-#: include/functions_setup.inc:760
+#: include/functions_setup.inc:681 include/functions_setup.inc:754
+#: include/functions_setup.inc:759
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:770
+#: include/functions_setup.inc:769
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:826
+#: include/functions_setup.inc:825
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:857
+#: include/functions_setup.inc:856
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:866
+#: include/functions_setup.inc:865
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:976 include/functions_setup.inc:999
-#: include/functions_setup.inc:1008 html/index.php:176
+#: include/functions_setup.inc:975 include/functions_setup.inc:998
+#: include/functions_setup.inc:1007 html/index.php:176
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -6429,6 +6411,61 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
+#: include/class_ldap.inc:398
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:631
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:644
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:660
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:426
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
 #: include/functions_helpviewer.inc:260
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
@@ -6439,6 +6476,28 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "next"
+msgstr ""
+
+#: html/helpviewer.php:141
+#, php-format
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgstr ""
+
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
@@ -6451,10 +6510,6 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -6523,22 +6578,51 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
 
-#: html/helpviewer.php:85
-msgid "previous"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: html/helpviewer.php:89
-msgid "next"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: html/helpviewer.php:141
-#, php-format
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+msgid "Username"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -6579,51 +6663,18 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-msgid "Username"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:15
@@ -6784,7 +6835,29 @@ msgstr ""
 msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:100
+#: ihtml/themes/altlinux/setup_step4.tpl:99
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it  could be a security risk)  "
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+msgid "Display PHP errors"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+msgid "true"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+msgid "false"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
@@ -6837,18 +6910,12 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
 #: ihtml/themes/default/setup_step4.tpl:100
@@ -6857,23 +6924,3 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting. "
 "(But it could be a security risk)  "
 msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:104
-msgid "Display PHP errors"
-msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:107
-msgid "true"
-msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:108
-msgid "false"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""