X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=locale%2Fmessages.po;h=1a66d9856b8e2b25520df3ba9034552c14147714;hb=ac1cddf931fe70461753bb6c005ea42a548b1d0c;hp=7ac6b95efb7e6fa9caa780803347e2376f2ad202;hpb=71f9eb8d6a492c026ea77262e207988b8e5d4b68;p=gosa.git

diff --git a/locale/messages.po b/locale/messages.po
index 7ac6b95ef..1a66d9856 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,16 +6,17 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:40
+#: contrib/gosa.conf:42
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:55 contrib/gosa.conf:66 contrib/gosa.conf:74
-#: contrib/gosa.conf:80 contrib/gosa.conf:88 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:115
-#: contrib/gosa.conf:120 contrib/gosa.conf:125 contrib/gosa.conf:130
-#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:57 contrib/gosa.conf:68 contrib/gosa.conf:76
+#: contrib/gosa.conf:82 contrib/gosa.conf:88 contrib/gosa.conf:96
+#: contrib/gosa.conf:105 contrib/gosa.conf:113 contrib/gosa.conf:118
+#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
+#: contrib/gosa.conf:138 plugins/personal/mail/generic.tpl:4
+#: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
+#: plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
@@ -23,29 +24,29 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:56
+#: contrib/gosa.conf:58
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:57 contrib/gosa.conf:68
+#: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/admin/ogroups/tabs_ogroups.inc:29
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:58 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:59
+#: 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 ""
 
-#: contrib/gosa.conf:60 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
@@ -53,11 +54,11 @@ msgstr ""
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:61 plugins/personal/generic/generic.tpl:214
+#: 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
@@ -68,93 +69,226 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:70 contrib/gosa.conf:76
-#: contrib/gosa.conf:84 contrib/gosa.conf:93 contrib/gosa.conf:101
-#: contrib/gosa.conf:106 contrib/gosa.conf:111 contrib/gosa.conf:116
-#: contrib/gosa.conf:121 contrib/gosa.conf:126 contrib/gosa.conf:131
+#: contrib/gosa.conf:64 contrib/gosa.conf:72 contrib/gosa.conf:78
+#: contrib/gosa.conf:84 contrib/gosa.conf:92 contrib/gosa.conf:101
+#: contrib/gosa.conf:109 contrib/gosa.conf:114 contrib/gosa.conf:119
+#: contrib/gosa.conf:124 contrib/gosa.conf:129 contrib/gosa.conf:134
+#: contrib/gosa.conf:139
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:67
+#: contrib/gosa.conf:69
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:71
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:81 contrib/gosa.conf:98
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
+msgid "Parameter"
+msgstr ""
+
+#: contrib/gosa.conf:89 contrib/gosa.conf:106
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:82 contrib/gosa.conf:99
+#: contrib/gosa.conf:90 contrib/gosa.conf:107
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:100
+#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
 msgid "Monitoring"
 msgstr ""
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:97
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:90 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:143 plugins/addons/ldapmanager/contentexport.tpl:19
-#: plugins/addons/ldapmanager/contentexport.tpl:32
-#: plugins/addons/ldapmanager/contentexport.tpl:47
+#: 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:144 plugins/personal/mail/generic.tpl:107
-#: plugins/addons/ldapmanager/contentimport.tpl:56
-#: plugins/addons/ldapmanager/contentcsv.tpl:119
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: 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:145
+#: contrib/gosa.conf:153
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:160
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:181
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:182
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr ""
 
+#: 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"
 msgstr ""
 
@@ -167,176 +301,198 @@ msgstr ""
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:21 plugins/admin/groups/mail.tpl:24
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:31
-#: plugins/admin/systems/class_terminalInfo.inc:136
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not defined"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:33 plugins/admin/groups/mail.tpl:36
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:47 plugins/admin/groups/mail.tpl:46
-msgid "Alternate addresses"
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:47
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:55 plugins/personal/mail/generic.tpl:121
-#: plugins/personal/mail/mail_locals.tpl:49
-#: plugins/personal/posix/posix_groups.tpl:56
-#: plugins/personal/posix/trust_machines.tpl:45
-#: plugins/personal/posix/generic.tpl:63
-#: plugins/personal/posix/generic.tpl:122
-#: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:45
-#: plugins/personal/connectivity/class_kolabAccount.inc:195
-#: plugins/personal/connectivity/kolab.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:60
-#: plugins/gofax/faxaccount/generic.tpl:73
-#: plugins/gofax/faxaccount/locals.tpl:48
-#: plugins/gofax/faxaccount/lists.tpl:11 plugins/gofax/faxaccount/lists.tpl:15
-#: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:45
-#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/mail_locals.tpl:49
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:45
-#: plugins/admin/systems/startup.tpl:59 plugins/admin/systems/startup.tpl:72
-#: plugins/admin/systems/startup.tpl:91
-#: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:207
-#: plugins/gofon/phoneaccount/generic.tpl:45
-msgid "Add"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:125
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/generic.tpl:124
+#: 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:19
-#: plugins/gofax/blocklists/generic.tpl:61
+#: 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:17
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:12
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:53
-#: plugins/admin/groups/mail.tpl:99 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/groups/generic.tpl:89
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:18
+#: plugins/gofax/faxaccount/generic.tpl:77
+#: plugins/gofax/faxaccount/lists.tpl:13
+#: 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/generic.tpl:90 plugins/admin/users/headpage.tpl:19
+#: plugins/admin/users/remove.tpl:15
+#: plugins/admin/applications/headpage.tpl:18
 #: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/applications/headpage.tpl:17
+#: plugins/admin/departments/headpage.tpl:18
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:46
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:60 plugins/admin/systems/startup.tpl:73
-#: plugins/admin/systems/startup.tpl:92 plugins/admin/ogroups/generic.tpl:39
-#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/generic.tpl:47
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: 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/gofon/macro/headpage.tpl:18 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Delete"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:65
+#: plugins/personal/mail/generic.tpl:66
 msgid "Mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:70
+#: plugins/personal/mail/generic.tpl:71
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:70
+#: plugins/personal/mail/generic.tpl:71
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:73
+#: plugins/personal/mail/generic.tpl:74
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:73
+#: plugins/personal/mail/generic.tpl:74
 msgid "Activate vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:80
-msgid "Select if you want to filter this mails thru spamassassin"
+#: plugins/personal/mail/generic.tpl:81
+msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:80
+#: plugins/personal/mail/generic.tpl:81
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:85
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:90
+#: plugins/personal/mail/generic.tpl:92
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:94
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:98
+#: plugins/personal/mail/generic.tpl:100
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:113
+#: plugins/personal/mail/generic.tpl:117
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:123
-#: plugins/gofax/faxaccount/generic.tpl:74 plugins/admin/groups/mail.tpl:98
+#: plugins/personal/mail/generic.tpl:128
+#: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:133
+#: plugins/personal/mail/generic.tpl:138
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:138
+#: plugins/personal/mail/generic.tpl:143
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:144
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:151
 msgid "Use custom sieve script"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:151
 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:6
+#: 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
@@ -352,6 +508,7 @@ 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
 msgid "This does something"
@@ -367,239 +524,141 @@ msgstr ""
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:189
+#: plugins/personal/mail/class_mailAccount.inc:200
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:197
+#: plugins/personal/mail/class_mailAccount.inc:209
 #: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:198
+#: plugins/personal/mail/class_mailAccount.inc:210
 #: plugins/admin/groups/class_groupMail.inc:188
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:201
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:249
+#: plugins/personal/mail/class_mailAccount.inc:260
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:255
+#: plugins/personal/mail/class_mailAccount.inc:266
 #: plugins/admin/groups/class_groupMail.inc:250
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:305
+#: plugins/personal/mail/class_mailAccount.inc:316
 #: plugins/admin/groups/class_groupMail.inc:283
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:668
+#: 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:689
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:672
-#: plugins/personal/mail/class_mailAccount.inc:676
-#: plugins/addons/addressbook/class_addressbook.inc:529
+#: 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:683
+#: 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:689
+#: 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:698
+#: 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:708
+#: 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:60
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:74
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:257
-#: plugins/admin/users/class_userManagement.inc:503
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:438
-#: plugins/admin/ogroups/class_ogroupManagement.inc:274
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:51
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/personal/posix/trust_machines.tpl:47
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:47
-#: 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:62
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:76
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:50
-#: plugins/gofax/faxaccount/lists.tpl:37 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:51 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:505
-#: plugins/admin/users/template.tpl:48 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:440
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:58
-#: plugins/admin/ogroups/class_ogroupManagement.inc:276
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/classic/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:16
-#: plugins/gofax/faxaccount/generic.tpl:88
-#: plugins/gofax/faxaccount/generic.tpl:94
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:60
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:17
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/phoneaccount/main.inc:112
-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:29
-#: plugins/admin/groups/mail_locals.tpl:29
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/personal/posix/posix_groups.tpl:37
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/personal/samba/samba3_workstations.tpl:30
-#: plugins/gofax/blocklists/headpage.tpl:50
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:72
-#: plugins/admin/groups/headpage.tpl:57
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:30 plugins/admin/users/headpage.tpl:61
-#: plugins/admin/applications/headpage.tpl:46
-#: plugins/admin/departments/headpage.tpl:46
-#: plugins/admin/systems/headpage.tpl:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/ogroups/headpage.tpl:58
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:35
-#: plugins/admin/groups/mail_locals.tpl:35
-msgid "Display addresses matching"
+#: plugins/personal/mail/class_mailAccount.inc:733
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:36
-#: plugins/personal/posix/trust_machines.tpl:36
-#: plugins/personal/samba/samba3_workstations.tpl:36
-#: plugins/admin/groups/mail_locals.tpl:36
-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:39
-#: plugins/admin/groups/mail_locals.tpl:39
-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:40
-#: plugins/admin/groups/mail_locals.tpl:40
-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
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:34
-#: ihtml/themes/altlinux/login.tpl:38 ihtml/themes/classic/login.tpl:34
-#: ihtml/themes/classic/login.tpl:38
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:34 ihtml/themes/default/login.tpl:38
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 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 "
@@ -632,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:19
+#: 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 ""
@@ -641,25 +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:51
-#: plugins/addons/ldapmanager/contentcsv.tpl:124
-#: plugins/addons/ldapmanager/contentexport.tpl:70 include/functions.inc:1199
-#: 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:94
-#: 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 "
@@ -698,180 +738,184 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
+#: 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/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:36
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:37
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:36
-#: plugins/admin/departments/headpage.tpl:36
-#: plugins/admin/systems/headpage.tpl:37
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:37
-msgid "Filters"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that are primary groups of users"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Show primary groups"
+#: 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/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Select to see groups that have samba groups mappings"
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:48
-msgid "Select to see groups that have applications configured"
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:48
-msgid "Show application groups"
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
-msgid "Select to see groups that have mail settings"
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
-msgid "Show mail groups"
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see normal groups that have only functional aspects"
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Show functional groups"
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:56 plugins/admin/ogroups/headpage.tpl:57
-msgid "Display groups of department"
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:42
-#: plugins/admin/groups/headpage.tpl:62 plugins/admin/ogroups/headpage.tpl:63
-msgid "Display groups matching"
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:43
-#: plugins/admin/groups/headpage.tpl:63 plugins/admin/ogroups/headpage.tpl:64
-msgid "Regular expression for matching group names"
+#: plugins/personal/posix/posix_groups.tpl:6
+msgid "Select groups to add"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:46
-#: plugins/admin/groups/headpage.tpl:66
-msgid "Display groups of user"
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:37
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:38
+#: plugins/admin/groups/group_objects.tpl:20
+#: 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/ogroups/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:37
+msgid "Filters"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:47
-#: plugins/admin/groups/headpage.tpl:67
-msgid "User name of which groups are shown"
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:5
-msgid "User must change password on first login"
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show primary groups"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:19
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:225
-msgid "Password expires on"
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:48
+msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:48
+msgid "Show samba groups"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:29
-#: plugins/admin/systems/headpage.tpl:55
-msgid "Display systems of department"
+#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/admin/groups/headpage.tpl:49
+msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:35
-#: plugins/admin/systems/headpage.tpl:61
-msgid "Display systems matching"
+#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/admin/groups/headpage.tpl:49
+msgid "Show application groups"
 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:609
-msgid "Home directory"
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Select to see normal groups that have only functional aspects"
 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"
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show functional groups"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:38
-msgid "Force UID/GID"
+#: plugins/personal/posix/posix_groups.tpl:36
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
+msgid "Display groups of department"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:40
-msgid "UID"
+#: plugins/personal/posix/posix_groups.tpl:48
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
+msgid "Display groups matching"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:45
-msgid "GID"
+#: plugins/personal/posix/posix_groups.tpl:51
+#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
+msgid "Regular expression for matching group names"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:54
-msgid "Group membership"
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/admin/groups/headpage.tpl:71
+msgid "Display groups of user"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:56
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
+#: plugins/personal/posix/posix_groups.tpl:61
+#: plugins/admin/groups/headpage.tpl:72
+msgid "User name of which groups are shown"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:74
-msgid "Account"
+#: plugins/personal/posix/posix_shadow.tpl:5
+msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:89
-msgid "Environment"
+#: plugins/personal/posix/posix_shadow.tpl:19
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:225
+msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:92
-msgid "Default printer"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:100
-msgid "Default language"
+#: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of department"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:113
-msgid "System trust"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:71
+msgid "Display systems matching"
+msgstr ""
+
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
@@ -880,7 +924,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:950
 msgid "Group of user"
 msgstr ""
 
@@ -889,8 +933,8 @@ msgid "unconfigured"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:190
-#: plugins/admin/systems/class_terminalService.inc:121
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:99
+#: plugins/admin/systems/class_terminalService.inc:122
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
 msgid "automatic"
 msgstr ""
 
@@ -946,227 +990,225 @@ msgid "Warn user %s days before password expiery"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:516
-#: plugins/personal/samba/class_sambaAccount.inc:441
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
+#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:541
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:517
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:675
+#: plugins/personal/posix/class_posixAccount.inc:710
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:823
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:826
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:834
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:837
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:841
-#: plugins/admin/groups/class_groupGeneric.inc:602
+#: 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:844
-#: plugins/admin/groups/class_groupGeneric.inc:605
+#: 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:853
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:863
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:866
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:987
-#: plugins/admin/groups/class_groupGeneric.inc:636
+#: 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 ""
@@ -1177,7 +1219,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:75
-#: plugins/personal/samba/class_sambaAccount.inc:610
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr ""
 
@@ -1226,17 +1268,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:116
-#: plugins/personal/samba/class_sambaAccount.inc:617
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:618
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:619
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr ""
 
@@ -1293,22 +1335,22 @@ 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 ""
 
-#: plugins/personal/samba/samba3_workstations.tpl:29
+#: plugins/personal/samba/samba3_workstations.tpl:26
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/samba3_workstations.tpl:35
+#: plugins/personal/samba/samba3_workstations.tpl:30
 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 ""
@@ -1340,113 +1382,234 @@ msgid ""
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:442
+#: plugins/personal/samba/class_sambaAccount.inc:451
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:443
+#: plugins/personal/samba/class_sambaAccount.inc:452
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:444
+#: plugins/personal/samba/class_sambaAccount.inc:453
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:445
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:612
+#: plugins/personal/samba/class_sambaAccount.inc:629
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:622
+#: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:628
+#: plugins/personal/samba/class_sambaAccount.inc:645
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:805
+#: plugins/personal/samba/class_sambaAccount.inc:822
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:830
+#: plugins/personal/samba/class_sambaAccount.inc:847
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "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/class_addressbook.inc:463
+#: 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/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:463
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:29
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
 msgid "Login"
 msgstr ""
 
@@ -1478,11 +1641,12 @@ 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
 msgid "Base"
 msgstr ""
 
@@ -1513,7 +1677,7 @@ msgid "Password storage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:138
-#: plugins/personal/generic/generic_certs.tpl:7
+#: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
@@ -1562,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 ""
@@ -1640,191 +1804,261 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:14
-msgid "Standard certificate"
+#: 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_certs.tpl:19
-#: plugins/personal/generic/generic_certs.tpl:30
-#: plugins/personal/generic/generic_certs.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:198
-#: plugins/admin/groups/class_groupMail.inc:408
-#: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/classic/islocked.tpl:13
-#: ihtml/themes/default/islocked.tpl:13
-msgid "Remove"
-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:25
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
+msgstr ""
+
+#: plugins/personal/generic/generic_certs.tpl:17
+#: plugins/personal/generic/generic_certs.tpl:37
+#: plugins/personal/generic/generic_certs.tpl:57
+#: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/admin/groups/class_groupMail.inc:408
+#: plugins/admin/applications/class_applicationParameters.inc:94
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
+msgid "Remove"
+msgstr ""
+
+#: plugins/personal/generic/generic_certs.tpl:28
 msgid "S/MIME certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:36
+#: plugins/personal/generic/generic_certs.tpl:48
 msgid "PKCS12 certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:65
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:225
-msgid "female"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:225
-msgid "male"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:235
-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:264
-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:358
-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:362
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/admin/systems/class_terminalInfo.inc:52
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "present"
+#: plugins/personal/connectivity/proxy.tpl:79
+msgid "per"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
-#: plugins/personal/generic/class_user.inc:389
-msgid "absent"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:777
-msgid "Kerberos database communication failed"
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:794
-msgid "Can't remove user from kerberos database."
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:805
-msgid "Can't add user to kerberos database."
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:845
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:850
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:856
-#: plugins/addons/addressbook/class_addressbook.inc:486
-#: plugins/admin/users/class_userManagement.inc:422
-msgid "The required field 'Name' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:865
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:871
-#: plugins/addons/addressbook/class_addressbook.inc:490
-#: plugins/admin/users/class_userManagement.inc:425
-msgid "The required field 'Given name' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:874
-msgid "The required field 'Login' is not set."
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:881
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr ""
+
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:888
+#: plugins/personal/connectivity/kolab.tpl:4
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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:891
-msgid "The field 'Homepage' contains an invalid URL definition."
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/personal/generic/class_user.inc:922
-#: plugins/addons/addressbook/class_addressbook.inc:496
-#: plugins/addons/addressbook/class_addressbook.inc:524
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:897
-#: plugins/personal/generic/class_user.inc:919
-#: plugins/addons/addressbook/class_addressbook.inc:499
-#: plugins/addons/addressbook/class_addressbook.inc:521
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/personal/generic/class_user.inc:905
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/admin/departments/class_departmentGeneric.inc:158
-msgid "The field 'Phone' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:908
-#: plugins/addons/addressbook/class_addressbook.inc:510
-#: plugins/admin/departments/class_departmentGeneric.inc:161
-msgid "The field 'Fax' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:911
-#: plugins/addons/addressbook/class_addressbook.inc:513
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:914
-#: plugins/addons/addressbook/class_addressbook.inc:516
-msgid "The field 'Pager' contains an invalid phone number."
+#: 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:107
-msgid "You are not allowed to set your password!"
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:1
-msgid "Proxy account"
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:8
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:13
-msgid "Limit proxy access to working time"
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:42
-msgid "Restrict proxy usage by quota"
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:52
-msgid "per"
+#: 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
@@ -1862,240 +2096,206 @@ msgstr ""
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:172
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:224
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:243
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
 #, php-format
 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"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:120
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:123
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:126
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:129
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:132
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 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:5
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:663
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
-msgid "Couldn't Connect To Postgresql Database"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:667
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:671
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:4
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
 msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:22
-msgid "Mail size"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:31
-msgid "Free Busy information"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:34
-msgid "URL"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:38
-msgid "Future"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:39
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:44
-msgid "Invitation policy"
-msgstr ""
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr ""
-
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: 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/pureftpd.tpl:39
-msgid "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/pureftpd.tpl:50
-msgid "Ratio"
+#: 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/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: 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/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: plugins/gofax/blocklists/headpage.tpl:55
+msgid "Display lists of department"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
+#: plugins/gofax/blocklists/headpage.tpl:69
+msgid "Display lists matching"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/gofax/blocklists/headpage.tpl:72
+msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: plugins/gofax/blocklists/headpage.tpl:80
+msgid "Display lists containing"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
+#: plugins/gofax/blocklists/headpage.tpl:83
+msgid "Show lists containing entered numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:69
-msgid "KB"
+#: 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/class_proxyAccount.inc:69
-msgid "GB"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
-msgid "hour"
+#: 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/class_proxyAccount.inc:70
-msgid "day"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
-msgid "week"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
-msgid "month"
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
@@ -2123,90 +2323,35 @@ msgstr ""
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:343
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:349
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
 #: plugins/admin/departments/class_departmentGeneric.inc:143
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:352
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:360
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:367
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
 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:31
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/functions.inc:1572
-msgid "Type"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:33
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:39 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/generic/references/contents.tpl:11
-msgid "Description"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:41
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:54
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:64
-#: plugins/gofax/blocklists/headpage.tpl:24
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:25 plugins/admin/users/headpage.tpl:26
-#: plugins/admin/applications/headpage.tpl:24
-#: plugins/admin/departments/headpage.tpl:24
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:25
-msgid "Information"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:66
-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
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 html/index.php:215
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/classic/conflict.tpl:6 ihtml/themes/classic/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr ""
 
@@ -2219,74 +2364,12 @@ msgstr ""
 #: plugins/gofax/blocklists/remove.tpl:11
 #: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
 #: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11
+#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
 msgid ""
 "So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
 "abort."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:15
-#: plugins/admin/groups/headpage.tpl:15 plugins/admin/users/headpage.tpl:15
-#: plugins/admin/applications/headpage.tpl:15
-#: plugins/admin/departments/headpage.tpl:15
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:15
-msgid "New"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:28
-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:31
-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:45
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:46
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:46
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:49
-msgid "Display lists of department"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:55
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:56
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:59
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:60
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2331,19 +2414,19 @@ msgstr ""
 msgid "Deliver fax to printer"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:68
+#: plugins/gofax/faxaccount/generic.tpl:69
 msgid "Alternate fax numbers"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:83
+#: plugins/gofax/faxaccount/generic.tpl:85
 msgid "Blocklists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:86
+#: plugins/gofax/faxaccount/generic.tpl:88
 msgid "Blocklists for incoming fax"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:92
+#: plugins/gofax/faxaccount/generic.tpl:94
 msgid "Blocklists for outgoing fax"
 msgstr ""
 
@@ -2355,19 +2438,19 @@ msgstr ""
 msgid "Display numbers of department"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:40
 msgid "Display numbers matching"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:35
+#: plugins/gofax/faxaccount/locals.tpl:43
 msgid "Regular expression for matching numbers"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:38
+#: plugins/gofax/faxaccount/locals.tpl:49
 msgid "Display numbers of user"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:39
+#: plugins/gofax/faxaccount/locals.tpl:52
 msgid "User name of which numbers are shown"
 msgstr ""
 
@@ -2375,23 +2458,23 @@ msgstr ""
 msgid "Blocked numbers/lists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:18
+#: plugins/gofax/faxaccount/lists.tpl:19
 #: plugins/admin/groups/mail_admins.tpl:24
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:24 plugins/admin/groups/acl.tpl:12
+#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
 #: plugins/admin/groups/mail_admins.tpl:30
 msgid "Choose"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:26
+#: plugins/gofax/faxaccount/lists.tpl:27
 msgid "List of predefined blocklists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:35
+#: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1190
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1194
 msgid "Apply"
 msgstr ""
 
@@ -2414,40 +2497,108 @@ msgstr ""
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
-msgid ""
-"This account has fax features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+msgid ""
+"This account has fax features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
+msgid "Create fax account"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
+msgid ""
+"This account has fax features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
+msgid "You're trying to add an invalid phone number."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+msgid "The required field 'Fax' is not set."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+msgid "Please enter a valid telephone number in the 'Fax' field."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
+msgid "Mail delivery is checked, but no address has been specified."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
+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/faxaccount/class_gofaxAccount.inc:123
-msgid "Create fax account"
+#: 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/faxaccount/class_gofaxAccount.inc:124
-msgid ""
-"This account has fax features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+msgid "User"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
-msgid "You're trying to add an invalid phone number."
+#: plugins/gofax/reports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/reports/contents.tpl:30
+msgid "Date"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:462
-msgid "The required field 'Fax' is not set."
+#: plugins/gofax/reports/contents.tpl:33
+msgid "Sender"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:466
-msgid "Please enter a valid telephone number in the 'Fax' field."
+#: plugins/gofax/reports/contents.tpl:34
+msgid "Receiver"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
-msgid "Mail delivery is checked, but no address has been specified."
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:476
-msgid "The mail address you've entered is invalid."
+#: 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
@@ -2462,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 ""
@@ -2494,8 +2641,8 @@ msgstr ""
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
 #: plugins/gofax/reports/class_faxreport.inc:6
@@ -2527,76 +2674,90 @@ 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:77
-#: plugins/addons/logview/contents.tpl:45 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:65
-#: plugins/gofon/reports/contents.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:83
-#: 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:96
-#: 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
 msgid "Dial connection..."
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/class_addressbook.inc:337
-#: plugins/addons/addressbook/class_addressbook.inc:339
-#: plugins/addons/addressbook/class_addressbook.inc:340
-#: plugins/addons/addressbook/class_addressbook.inc:414
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:453
 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 ""
@@ -2611,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"
@@ -2642,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:67
-msgid "Select to see regular users"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:67
-msgid "Show organizational entries"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Select to see users in addressbook"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Show addressbook entries"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:71
-msgid "Display results for department"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:78
-msgid "Search string"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:81
-msgid "Match object"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:83
-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 ""
@@ -2716,86 +2805,91 @@ msgstr ""
 msgid "Addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:143
+#: plugins/addons/addressbook/class_addressbook.inc:149
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:147
+#: plugins/addons/addressbook/class_addressbook.inc:153
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:176
-#: plugins/addons/addressbook/class_addressbook.inc:280
+#: plugins/addons/addressbook/class_addressbook.inc:182
+#: plugins/addons/addressbook/class_addressbook.inc:286
 msgid "You are not allowed to delete this entry!"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:274
+#: plugins/addons/addressbook/class_addressbook.inc:280
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:343
+#: plugins/addons/addressbook/class_addressbook.inc:376
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:346
+#: plugins/addons/addressbook/class_addressbook.inc:380
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:426
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:428
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "organizations user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:432
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:434
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:463
-#: plugins/addons/logview/class_logview.inc:62
-#: plugins/addons/logview/class_logview.inc:76
+#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:464
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:464
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:577
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/addons/addressbook/class_addressbook.inc:589
 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"
@@ -2809,41 +2903,41 @@ msgstr ""
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:202
+#: plugins/addons/ldapmanager/class_csvimport.inc:200
 msgid "failed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:206
+#: plugins/addons/ldapmanager/class_csvimport.inc:204
 msgid "ok"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:263
+#: plugins/addons/ldapmanager/class_csvimport.inc:261
 msgid "status"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:267
+#: plugins/addons/ldapmanager/class_csvimport.inc:265
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:292
+#: plugins/addons/ldapmanager/class_csvimport.inc:290
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:301
-#: plugins/addons/ldapmanager/class_csvimport.inc:312
-#: plugins/addons/ldapmanager/class_csvimport.inc:317
-#: 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:306
-#: 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:444
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -2855,24 +2949,24 @@ msgid ""
 "conformance."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:12
+#: plugins/addons/ldapmanager/contentimport.tpl:10
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:17
-#: plugins/addons/ldapmanager/contentcsv.tpl:15
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
 msgid "Browse"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:26
+#: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:39
+#: plugins/addons/ldapmanager/contentimport.tpl:33
 msgid "Overwrite existing entry"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:47
+#: plugins/addons/ldapmanager/contentimport.tpl:40
 msgid "Import successful"
 msgstr ""
 
@@ -2884,27 +2978,27 @@ msgid ""
 "least the UID, GIVENNAME and SURENAME set."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:11
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
 msgid "Select CSV file to import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:20
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
 msgid "Select template"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:35
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
 msgid "All entries have been written to the LDAP database successfully."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:37
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
 msgid "Oups. There was an error during the import of your data."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:40
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
 msgid "Here is the status report for the import:"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:88
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
 msgid "Selected Template"
 msgstr ""
 
@@ -2912,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 ""
 
@@ -2923,40 +3017,35 @@ msgid ""
 "purpose or when initializing a new server."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:13
+#: plugins/addons/ldapmanager/contentexport.tpl:10
 msgid "Export single entry"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:21
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:27
-#: plugins/addons/ldapmanager/contentexport.tpl:42
+#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
+#: plugins/addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:63
+#: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the complete LDAP database to a file"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:63
+#: plugins/addons/ldapmanager/contentexport.tpl:59
 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 ""
@@ -2965,10 +3054,14 @@ msgstr ""
 msgid "You've no permission to do LDAP exports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:76
+#: plugins/addons/ldapmanager/class_export.inc:80
 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 ""
@@ -2977,55 +3070,54 @@ msgstr ""
 msgid "No LOG servers defined!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:43
-#: plugins/addons/logview/class_logview.inc:131
-msgid "Can't connect to log database, no logs can be shown!"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:47
-#: plugins/addons/logview/class_logview.inc:135
+#: plugins/addons/logview/class_logview.inc:48
+#: plugins/addons/logview/class_logview.inc:138
 msgid "Can't select log database for log generation!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:56
-#: plugins/addons/logview/class_logview.inc:70
-#: plugins/addons/logview/class_logview.inc:208
+#: plugins/addons/logview/class_logview.inc:57
+#: plugins/addons/logview/class_logview.inc:71
+#: plugins/addons/logview/class_logview.inc:210
 msgid "Query for log database failed!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:80
+#: plugins/addons/logview/class_logview.inc:81
 msgid "one hour"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:80
+#: plugins/addons/logview/class_logview.inc:81
 msgid "6 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:81
+#: plugins/addons/logview/class_logview.inc:82
 msgid "12 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:81
+#: plugins/addons/logview/class_logview.inc:82
 msgid "24 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/logview/class_logview.inc:83
 msgid "2 days"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/logview/class_logview.inc:83
 msgid "one week"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:83
+#: plugins/addons/logview/class_logview.inc:84
 msgid "2 weeks"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:83
+#: plugins/addons/logview/class_logview.inc:84
 msgid "one month"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:12
+#: plugins/addons/logview/class_logview.inc:135
+msgid "Can't connect to log database, no logs can be shown!"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
 msgstr ""
 
@@ -3033,32 +3125,53 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:37
+#: plugins/addons/logview/contents.tpl:38
 msgid "Time interval"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:46
+#: plugins/addons/logview/contents.tpl:48
 msgid "Enter string to search for"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:58
+#: plugins/addons/logview/contents.tpl:60
 msgid "Ruleset"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:81
+#: plugins/addons/logview/contents.tpl:82
 msgid "Level"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:82
+#: plugins/addons/logview/contents.tpl:83
 msgid "Hostname"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:84
+#: plugins/addons/logview/contents.tpl:85
 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
@@ -3069,34 +3182,44 @@ msgstr ""
 msgid "Select mail server to place user on"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:64
+#: plugins/admin/groups/mail.tpl:66
 msgid "IMAP shared folders"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:68
+#: plugins/admin/groups/mail.tpl:70
 msgid "Default permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:76
+#: plugins/admin/groups/mail.tpl:79
 msgid "Member permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:91
+#: plugins/admin/groups/mail.tpl:94
 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"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:202
+#: plugins/admin/groups/class_groupManagement.inc:204
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:208
-#: plugins/admin/groups/class_groupManagement.inc:234
+#: plugins/admin/groups/class_groupManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:236
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
@@ -3108,163 +3231,69 @@ msgstr ""
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:254
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:258
+#: plugins/admin/groups/class_groupGeneric.inc:259
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:566
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:574
+#: plugins/admin/ogroups/class_ogroup.inc:490
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:576
+#: plugins/admin/groups/class_groupGeneric.inc:584
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:587
-#: plugins/admin/groups/class_groupGeneric.inc:594
+#: plugins/admin/groups/class_groupGeneric.inc:595
+#: plugins/admin/groups/class_groupGeneric.inc:602
 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."
-msgstr ""
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:29
-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:32 plugins/admin/ogroups/headpage.tpl:32
-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:53 plugins/admin/users/headpage.tpl:57
-msgid "Dive into LDAP subtrees when searching"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:53 plugins/admin/users/headpage.tpl:57
-msgid "Search in subtrees"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:153
-msgid "read"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:154
-msgid "post"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:155
-msgid "external post"
-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."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:613
-msgid "Please enter a valid email addres in 'Primary address' field."
-msgstr ""
-
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr ""
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr ""
-
 #: plugins/admin/groups/application.tpl:4
 msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit parameters"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit optional application parameters"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:20
+#: plugins/admin/groups/application.tpl:21
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:29
-#: plugins/admin/users/headpage.tpl:60
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:35
-#: plugins/admin/users/headpage.tpl:66
-msgid "Display users matching"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:36
-#: plugins/admin/users/headpage.tpl:67
-msgid "Regular expression for matching user names"
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
@@ -3311,8 +3340,31 @@ msgstr ""
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:26
+#: plugins/admin/users/headpage.tpl:67
+msgid "Display users of department"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/users/headpage.tpl:71
+msgid "Display users matching"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:31
+#: plugins/admin/users/headpage.tpl:72
+msgid "Regular expression for matching user names"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
 msgstr ""
 
 #: plugins/admin/groups/application_options.tpl:1
@@ -3351,196 +3403,221 @@ 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 would'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:202
-msgid "none"
+#: plugins/admin/groups/class_groupMail.inc:179
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:434
-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:617
-#: 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:46
-#: ihtml/themes/altlinux/setup_introduction.tpl:10
-#: ihtml/themes/altlinux/setup_step2.tpl:16
-#: ihtml/themes/altlinux/setup_step3.tpl:12
-#: 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
 msgid "List of users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:16
+#: plugins/admin/users/headpage.tpl:17
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:30
+#: plugins/admin/users/headpage.tpl:31
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
 "great number of users, you may want to use the range selectors on top of the "
 "user list."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:33
+#: plugins/admin/users/headpage.tpl:34
 msgid ""
 "-Edit- and -New...- execute an assistant to aid you in managing your account "
 "informations. -Delete- will ask for confirmation before deleting users."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:47
+#: plugins/admin/users/headpage.tpl:48
 msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:47
+#: plugins/admin/users/headpage.tpl:48
 msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:49
 msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:49
 msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:50
 msgid "Select to see users that have posix settings"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:50
 msgid "Show unix users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:51
 msgid "Select to see users that have mail settings"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:51
 msgid "Show mail users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:52
 msgid "Select to see users that have samba settings"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:52
 msgid "Show samba users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:53
 msgid "Select to see users that have proxy settings"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:53
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:53
-msgid "Select to see users that have ftp settings"
+#: 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."
+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."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+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!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:244
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr ""
+
+#: 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/users/class_userManagement.inc:368
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "none"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:437
+msgid "A person with the choosen name is already used in this tree."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:618
+#: plugins/admin/users/template.tpl:11
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:53
-msgid "Show FTP users"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:54
-msgid "Select to see users that have FAX settings"
+#: 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/users/headpage.tpl:54
-msgid "Show FAX users"
+#: 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/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"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/applications/headpage.tpl:29
 msgid ""
-"This application has options disabled. You can enable them by clicking below."
+"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/class_applicationParameters.inc:87
-msgid "Variable"
+#: 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/class_applicationParameters.inc:87
-msgid "Default value"
+#: plugins/admin/applications/headpage.tpl:46
+msgid "Display applications of department"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
+#: plugins/admin/applications/headpage.tpl:58
+msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
+#: plugins/admin/applications/headpage.tpl:61
+msgid "Regular expression for matching application names"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -3549,7 +3626,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: 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"
@@ -3560,6 +3637,7 @@ 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 ""
 
@@ -3599,39 +3677,45 @@ msgstr ""
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/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:28
-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:31
+#: 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:45
-msgid "Display applications of department"
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:51
-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:52
-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
@@ -3639,27 +3723,27 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:57
+#: plugins/admin/applications/class_applicationGeneric.inc:59
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:146
+#: plugins/admin/applications/class_applicationGeneric.inc:148
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:227
+#: plugins/admin/applications/class_applicationGeneric.inc:229
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:232
+#: plugins/admin/applications/class_applicationGeneric.inc:234
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:235
+#: plugins/admin/applications/class_applicationGeneric.inc:237
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:244
+#: plugins/admin/applications/class_applicationGeneric.inc:246
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
@@ -3673,6 +3757,36 @@ msgstr ""
 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
@@ -3737,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:28
-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:31
-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:51
-msgid "Display departments matching"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:52
-msgid "Regular expression for matching department names"
-msgstr ""
-
 #: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
 msgid "Department management"
 msgstr ""
@@ -3806,68 +3890,84 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:61
-#: plugins/admin/systems/class_terminalService.inc:135
+#: 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"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalInfo.inc:62
+#: plugins/admin/systems/class_terminalService.inc:136
 #: plugins/admin/systems/class_terminalStartup.inc:75
-#: plugins/admin/systems/class_terminalGeneric.inc:126
+#: plugins/admin/systems/class_terminalGeneric.inc:127
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalInfo.inc:69
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:130
+#: plugins/admin/systems/class_terminalInfo.inc:141
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:133
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:152
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:159
+#: plugins/admin/systems/class_terminalInfo.inc:170
 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:85
-#: plugins/admin/systems/class_componentGeneric.inc:47
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:156
-#: plugins/admin/systems/class_componentGeneric.inc:116
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:166
-#: plugins/admin/systems/class_terminalGeneric.inc:233
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_workstationGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:132
-#: plugins/admin/systems/class_componentGeneric.inc:126
-#: plugins/admin/systems/class_phoneGeneric.inc:129
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr ""
+
+#: 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
@@ -3942,297 +4042,332 @@ msgstr ""
 msgid "Memory usage"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:119
+msgid "Print service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr ""
+
+#: 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_winGeneric.inc:134
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
+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'."
+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"
+msgstr ""
+
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+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: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/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/info.tpl:116
-msgid "SSH service"
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan 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/info.tpl:125
-msgid "Sound 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/info.tpl:128
-msgid "GUI"
+#: 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_terminalService.inc:82
+#: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:83
+#: plugins/admin/systems/class_terminalService.inc:84
 msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:84
+#: plugins/admin/systems/class_terminalService.inc:85
 msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:87
+#: plugins/admin/systems/class_terminalService.inc:88
 msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:91
 msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:92
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:184
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:245
-#: plugins/admin/systems/class_terminalService.inc:250
+#: 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:260
-#: plugins/admin/systems/class_terminalService.inc:265
+#: 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/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:36
-msgid "Time Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:59
-msgid "LDAP Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:70
-msgid "Terminal Service"
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:75
-msgid "Temporary disable login"
+#: plugins/admin/systems/server.tpl:42
+msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:78
-msgid "Font path"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:91
-msgid "Syslog Service"
+#: plugins/admin/systems/class_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:99
-msgid "Print Service"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 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/printer.tpl:6
+msgid "Printer name"
 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/printer.tpl:32
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:42
-msgid "Select action to execute for this server"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_terminalGeneric.inc:64
 #: plugins/admin/systems/class_workstationGeneric.inc:72
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:88
-#: plugins/admin/systems/class_servGeneric.inc:58
+#: plugins/admin/systems/class_terminalGeneric.inc:89
+#: plugins/admin/systems/class_servGeneric.inc:59
 #: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:51
+#: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:92
-#: plugins/admin/systems/class_terminalGeneric.inc:104
-#: plugins/admin/systems/class_terminalGeneric.inc:116
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:93
+#: plugins/admin/systems/class_terminalGeneric.inc:105
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:63
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_servGeneric.inc:87
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 #: plugins/admin/systems/class_workstationGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:55
-#: plugins/admin/ogroups/class_termgroup.inc:67
-#: plugins/admin/ogroups/class_termgroup.inc:79
+#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:87
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:100
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_terminalGeneric.inc:101
+#: plugins/admin/systems/class_servGeneric.inc:71
 #: plugins/admin/systems/class_workstationGeneric.inc:110
-#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:71
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:112
-#: plugins/admin/systems/class_servGeneric.inc:82
+#: plugins/admin/systems/class_terminalGeneric.inc:113
+#: plugins/admin/systems/class_servGeneric.inc:83
 #: plugins/admin/systems/class_workstationGeneric.inc:122
-#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:83
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_servGeneric.inc:112
+#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_servGeneric.inc:112
+#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:153
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:146
+#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:154
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_terminalGeneric.inc:219
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:220
+#: plugins/admin/systems/class_terminalGeneric.inc:223
 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:48
+#: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:168
-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
-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"
+#: plugins/admin/systems/class_servGeneric.inc:163
+msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/class_servGeneric.inc:170
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:34
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationGeneric.inc:136
+msgid "This 'dn' has no workstation features."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:225
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:229
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr ""
@@ -4259,88 +4394,114 @@ msgstr ""
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:644
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:645
+#: plugins/admin/systems/class_systemManagement.inc:647
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:663
 msgid "Thin client template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:673
+#: plugins/admin/systems/class_systemManagement.inc:675
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:136
-msgid "This 'dn' has no workstation features."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:223
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:227
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:32
-msgid "Remove DNS service"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:35
-msgid "Add DNS service"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:121
-#: plugins/admin/systems/class_servDB.inc:137
-#: plugins/admin/systems/class_servDB.inc:143
-#: plugins/admin/systems/class_servDB.inc:148
-#: plugins/admin/systems/class_servDB.inc:154
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:127
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: 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/workstation.tpl:11
-msgid "Workstation name"
+#: 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
@@ -4403,23 +4564,31 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:56
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:122
-msgid "You have no permissions to create a printer on this 'Base'."
+#: 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/wingeneric.tpl:6
-msgid "Machine name"
+#: 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/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:141
+msgid "The sieve port needs to be numeric."
+msgstr ""
+
+#: 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
@@ -4439,12 +4608,12 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr ""
 
@@ -4453,7 +4622,7 @@ msgid "Select to see Linux terminals"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:47
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr ""
 
@@ -4462,7 +4631,7 @@ msgid "Select to see Linux workstations"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr ""
 
@@ -4487,7 +4656,7 @@ msgid "Select to see VOIP phones"
 msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr ""
 
@@ -4499,18 +4668,180 @@ msgstr ""
 msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
+#: plugins/admin/systems/headpage.tpl:74
 msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:82
 msgid "Display terminal(s) of user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:66
+#: plugins/admin/systems/headpage.tpl:85
 msgid "User name of which terminal(s) are shown"
 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."
+msgstr ""
+
+#: 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
 msgid "Keyboard"
 msgstr ""
@@ -4556,12 +4887,13 @@ msgid "Choose mouse port"
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:5
+#: plugins/gofon/phoneaccount/generic.tpl:22
 msgid "Telephone hardware"
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:9
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:26
 msgid "Telephone"
 msgstr ""
 
@@ -4673,98 +5005,14 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/startup.tpl:1
-msgid "Boot parameters"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:8
-msgid "LDAP server"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:16
-msgid "Boot kernel"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:18
-msgid "Enter the filename of the kernel to use"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:21
-msgid "Custom options"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:23
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:34
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:35
-msgid "use graphical bootup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:37
-msgid "Select if terminal should boot in text mode"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:38
-msgid "use standard linux textual bootup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:40
-msgid "Select to get more verbose output during startup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:41
-msgid "use debug mode for startup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:52
-msgid "Kernel modules (format: name parameters)"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:54
-msgid "Add additional modules to load on startup"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:65
-msgid "Automount devices (format: complete autofs entry)"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:67
-msgid "Add additional automount entries"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:84
-msgid "Additional fstab entries"
-msgstr ""
-
-#: plugins/admin/systems/startup.tpl:86
-msgid "Add additional filesystems to be mounted during startup"
-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>"
+#: 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/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-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
@@ -4809,234 +5057,262 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:47
-msgid "This 'dn' has no phone features."
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:119
-msgid "You have no permissions to create a phone on this 'Base'."
+#: plugins/admin/systems/startup.tpl:1
+msgid "Boot parameters"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:8
+msgid "LDAP server"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:17
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:22
+msgid "Custom options"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:36
+msgid "use graphical bootup"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr ""
+
+#: plugins/admin/systems/startup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:145
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/startup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:145
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/startup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:148
-msgid "Add Kolab service"
+#: plugins/admin/systems/startup.tpl:53
+msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:148
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/startup.tpl:55
+msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:167
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/startup.tpl:67
+msgid "Automount devices (format: complete autofs entry)"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:173
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/startup.tpl:69
+msgid "Add additional automount entries"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:197
-msgid "Free/Busy settings -> Future days must be set."
+#: plugins/admin/systems/startup.tpl:87
+msgid "Additional fstab entries"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Free/Busy settings -> Future days must be a positive value."
+#: plugins/admin/systems/startup.tpl:89
+msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:201
-msgid "Free/Busy settings -> Future days must be a value."
+#: plugins/admin/systems/class_phoneGeneric.inc:104
+msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:205
-msgid ""
-"Cyrus Quota settings -> The given Quota settings value must be a number."
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:207
-msgid ""
-"Cyrus Quota settings -> Please choose a value between 1 and 100 for Quota "
-"settings."
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:209
-msgid "Cyrus Quota settings -> Future days must be a value."
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:214
-msgid "SMTP privileged networks -> No value is given."
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:219
-msgid "SMTP smarthost/relayhost -> No value is given."
+#: plugins/admin/systems/class_phoneGeneric.inc:263
+msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/class_phoneGeneric.inc:266
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/class_phoneGeneric.inc:275
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/class_phoneGeneric.inc:282
+msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: 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/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: 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/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/ogroups/headpage.tpl:48
+msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/ogroups/headpage.tpl:49
+msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/ogroups/headpage.tpl:50
+msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/ogroups/headpage.tpl:52
+msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:142
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/ogroups/headpage.tpl:53
+msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:147
-msgid "Host used to relay mails"
+#: plugins/admin/ogroups/headpage.tpl:54
+msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
-msgid "Accept Internet Mail"
+#: plugins/admin/ogroups/headpage.tpl:55
+msgid "Show groups containing printers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:167
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: 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
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Show departments"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Select to see GOsa accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Show people"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Select to see GOsa groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Show groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Select to see applications"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Show applications"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Select to see workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Select to see printers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Show printers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Select to see phones"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
 msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:47
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 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"
@@ -5063,13 +5339,13 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:153
+#: plugins/admin/ogroups/class_ogroupManagement.inc:149
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+#: plugins/admin/ogroups/class_ogroupManagement.inc:155
+#: plugins/admin/ogroups/class_ogroupManagement.inc:181
 msgid "You are not allowed to delete this object group!"
 msgstr ""
 
@@ -5077,195 +5353,318 @@ msgstr ""
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:204
+#: plugins/admin/ogroups/class_ogroup.inc:205
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:206
+#: plugins/admin/ogroups/class_ogroup.inc:207
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
+#: plugins/admin/ogroups/class_ogroup.inc:208
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
+#: plugins/admin/ogroups/class_ogroup.inc:209
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:210
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
+#: plugins/admin/ogroups/class_ogroup.inc:211
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
+#: plugins/admin/ogroups/class_ogroup.inc:212
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
+#: plugins/admin/ogroups/class_ogroup.inc:213
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
+#: plugins/admin/ogroups/class_ogroup.inc:214
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
+#: plugins/admin/ogroups/class_ogroup.inc:215
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:221
+#: plugins/admin/ogroups/class_ogroup.inc:222
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:363
+#: plugins/admin/ogroups/class_ogroup.inc:369
 msgid "Non existing dn: "
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:494
+#: plugins/admin/ogroups/class_ogroup.inc:500
 msgid "Object groups need at least one member!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:499
+#: plugins/admin/ogroups/class_ogroup.inc:505
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: 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/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/gofon/macro/headpage.tpl:29
 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 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/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:46
-msgid "Show empty groups"
+#: plugins/gofon/macro/headpage.tpl:46
+msgid "Display macros of department"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:47
-msgid "Show groups containing users"
+#: plugins/gofon/macro/headpage.tpl:59
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show groups containing groups"
+#: plugins/gofon/macro/headpage.tpl:62
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:49
-msgid "Show groups containing applications"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:50
-msgid "Show groups containing departments"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Show groups containing servers"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Show groups containing workstations"
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:53
-msgid "Show groups containing terminals"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:54
-msgid "Show groups containing printers"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
-msgid "This account has no phone extensions."
+#: 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:124
-msgid "Remove phone account"
+#: 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:125
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:127
-msgid "Create phone account"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:128
-msgid ""
-"This account has phone features disabled. You can enable 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:140
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+msgid "String"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:176
-msgid "Choose your private phone"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+msgid "Combobox"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:232
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:238
+msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:287
+#: 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:301
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:320
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
 #, php-format
-msgid "The number '%s' is no valid phone number!"
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:325
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:161
+#, php-format
+msgid "The given cn '%s' already exists."
+msgstr ""
+
+#: 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 "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
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:38
+msgid "Forward calls to"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Phone number"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Timeout (s)"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+msgid "Phone macro"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:75
+msgid "Phone PIN"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+msgid "no macro"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+msgid "undefined"
+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."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
+msgid "This account has no phone extensions."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
+msgid "Remove phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
+msgid "Create phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:16
-msgid "Answering machine"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
+msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:22
-#: plugins/gofon/phoneaccount/generic.tpl:25
-msgid "Deliver missed calls as mail"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:39
-msgid "Phone numbers"
+#: 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/phoneaccount/generic.tpl:55
-msgid "Forward calls to"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
+#, php-format
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-msgid "Phone number"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
+#, php-format
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-msgid "Timeout (s)"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/main.inc:120
 msgid "Phone settings"
 msgstr ""
 
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr ""
+
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr ""
@@ -5303,10 +5702,6 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr ""
-
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5327,6 +5722,10 @@ msgstr ""
 msgid "Object name"
 msgstr ""
 
+#: plugins/generic/references/contents.tpl:11
+msgid "Contents"
+msgstr ""
+
 #: plugins/generic/references/contents.tpl:18
 msgid "This object has no relationship to other objects."
 msgstr ""
@@ -5353,195 +5752,220 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/functions.inc:267
+#: 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 ""
+
+#: include/php_setup.inc:71 html/main.php:292
+msgid "Toggle information"
+msgstr ""
+
+#: include/php_setup.inc:76
+msgid "PHP error"
+msgstr ""
+
+#: include/php_setup.inc:87
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:93
+msgid "function"
+msgstr ""
+
+#: include/php_setup.inc:98
+msgid "static"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "method"
+msgstr ""
+
+#: include/php_setup.inc:121
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:122
+msgid "File"
+msgstr ""
+
+#: include/php_setup.inc:122
+msgid "Line"
+msgstr ""
+
+#: include/php_setup.inc:123
+msgid "Arguments"
+msgstr ""
+
+#: include/functions.inc:272
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:288
+#: include/functions.inc:293
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:308
+#: include/functions.inc:312
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:346
+#: include/functions.inc:350
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:356
+#: 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:371
+#: include/functions.inc:375
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:397
+#: include/functions.inc:401
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:427
+#: include/functions.inc:431
 msgid ""
-"Getting the lock from LDAP failed. Parameters are not sed correctly, please "
+"Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:437
+#: 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:445
+#: 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:517
+#: include/functions.inc:521
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:519
+#: 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:531
+#: include/functions.inc:535
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:536
+#: include/functions.inc:540
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:919
+#: 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:1018
+#: include/functions.inc:1022
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1460
+#: include/functions.inc:1468
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1505
+#: include/functions.inc:1511
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1528
-msgid "Generating this page caused the PHP interpreter to rise some errors!"
-msgstr ""
-
-#: include/functions.inc:1528
-msgid "Send report"
-msgstr ""
-
-#: include/functions.inc:1528
-msgid "Toggle information"
-msgstr ""
-
-#: include/functions.inc:1535
-msgid "PHP error"
-msgstr ""
-
-#: include/functions.inc:1542
-msgid "class"
-msgstr ""
-
-#: include/functions.inc:1548
-msgid "function"
-msgstr ""
-
-#: include/functions.inc:1553
-msgid "static"
-msgstr ""
-
-#: include/functions.inc:1557
-msgid "method"
-msgstr ""
-
-#: include/functions.inc:1571
-msgid "Trace"
-msgstr ""
-
-#: include/functions.inc:1572
-msgid "File"
-msgstr ""
-
-#: include/functions.inc:1572
-msgid "Line"
-msgstr ""
-
-#: include/functions.inc:1573
-msgid "Arguments"
+#: include/class_mail-methods-cyrus.inc:39
+msgid ""
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:43
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:106
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:122
+#: include/class_mail-methods-cyrus.inc:131
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:133
-msgid ""
-"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:168
+#: include/class_mail-methods-cyrus.inc:173
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:190
+#: include/class_mail-methods-cyrus.inc:195
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:218
+#: include/class_mail-methods-cyrus.inc:223
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:231
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:302
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:306
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -5554,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_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."
@@ -5576,451 +6000,502 @@ 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:169
+#: include/class_password-methods.inc:162
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:188
+#: include/class_password-methods.inc:199
 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:142
-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:630
-#, 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:646
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:661
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
-#: include/setup_checks.inc:106
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
 
-#: include/setup_checks.inc:115 include/setup_checks.inc:124
+#: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/setup_checks.inc:144
+#: include/functions_setup.inc:136
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
 "setup"
 msgstr ""
 
-#: include/setup_checks.inc:147
+#: include/functions_setup.inc:140
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 
-#: include/setup_checks.inc:159
+#: include/functions_setup.inc:145
+#, php-format
+msgid "Support for '%s' enabled"
+msgstr ""
+
+#: include/functions_setup.inc:155
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 
-#: include/setup_checks.inc:162
+#: include/functions_setup.inc:159
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/setup_checks.inc:170
+#: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:173
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:177
+#: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:180
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:185
+#: include/functions_setup.inc:191
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:188
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/setup_checks.inc:192
+#: include/functions_setup.inc:201
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:195
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/setup_checks.inc:199
+#: include/functions_setup.inc:211
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:202
+#: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
 msgstr ""
 
-#: include/setup_checks.inc:206
+#: include/functions_setup.inc:221
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:209
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/setup_checks.inc:216
+#: include/functions_setup.inc:232
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/setup_checks.inc:221
+#: include/functions_setup.inc:240
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/setup_checks.inc:237
+#: include/functions_setup.inc:257
 msgid "OK"
 msgstr ""
 
-#: include/setup_checks.inc:240
+#: include/functions_setup.inc:260
 msgid "Ignored"
 msgstr ""
 
-#: include/setup_checks.inc:242
+#: include/functions_setup.inc:262
 msgid "Failed"
 msgstr ""
 
-#: include/setup_checks.inc:258
+#: include/functions_setup.inc:279
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/setup_checks.inc:259
+#: include/functions_setup.inc:280
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/setup_checks.inc:260
+#: 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/setup_checks.inc:263
-msgid "Checking for PHP version (<=5)"
-msgstr ""
-
-#: include/setup_checks.inc:264
-msgid "PHP must be below version 5."
-msgstr ""
-
-#: include/setup_checks.inc:268
+#: include/functions_setup.inc:284
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/setup_checks.inc:269
+#: 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/setup_checks.inc:272
+#: include/functions_setup.inc:288
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/setup_checks.inc:273
+#: include/functions_setup.inc:289
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/setup_checks.inc:276
+#: include/functions_setup.inc:292
+msgid "Checking for XML functions"
+msgstr ""
+
+#: include/functions_setup.inc:293
+msgid "XML functions are required to parse the configuration file."
+msgstr ""
+
+#: include/functions_setup.inc:296
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/setup_checks.inc:277
+#: include/functions_setup.inc:297
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/setup_checks.inc:279
+#: include/functions_setup.inc:299
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/setup_checks.inc:280
+#: include/functions_setup.inc:300
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/setup_checks.inc:283
+#: include/functions_setup.inc:303
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/setup_checks.inc:284
+#: 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/setup_checks.inc:287
+#: include/functions_setup.inc:307
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/setup_checks.inc:288
+#: 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/setup_checks.inc:290
+#: include/functions_setup.inc:311
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/setup_checks.inc:291
+#: 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/setup_checks.inc:293
+#: include/functions_setup.inc:315
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/setup_checks.inc:294
+#: include/functions_setup.inc:316
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/setup_checks.inc:296
+#: include/functions_setup.inc:319
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/setup_checks.inc:297
+#: 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/setup_checks.inc:299
+#: include/functions_setup.inc:323
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/setup_checks.inc:300
+#: include/functions_setup.inc:324
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/setup_checks.inc:309
+#: include/functions_setup.inc:327
+msgid "Checking for snmp Module"
+msgstr ""
+
+#: include/functions_setup.inc:328
+msgid ""
+"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgstr ""
+
+#: include/functions_setup.inc:337
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/setup_checks.inc:318
+#: include/functions_setup.inc:346
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/setup_checks.inc:319
+#: 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/setup_checks.inc:322
+#: include/functions_setup.inc:350
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/setup_checks.inc:323
+#: 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/setup_checks.inc:330
+#: include/functions_setup.inc:358
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/setup_checks.inc:331
+#: 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/setup_checks.inc:346
+#: include/functions_setup.inc:374
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/setup_checks.inc:347
+#: 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/setup_checks.inc:378
-msgid "PHP.ini check -> session.auto_register"
+#: include/functions_setup.inc:388
+msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/setup_checks.inc:379
+#: include/functions_setup.inc:389
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini musst be 'Off'."
+"in your php.ini must be set to 'Off'."
+msgstr ""
+
+#: include/functions_setup.inc:392
+msgid "php.ini check -> implicit_flush"
+msgstr ""
+
+#: include/functions_setup.inc:393
+msgid ""
+"This option influences the Output handling. Turn this Option off, to "
+"increase performance."
+msgstr ""
+
+#: include/functions_setup.inc:400
+msgid "php.ini check -> max_execution_time"
+msgstr ""
+
+#: 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:408
+msgid "php.ini check -> memory_limit"
+msgstr ""
+
+#: 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:413
+msgid "php.ini check -> expose_php"
+msgstr ""
+
+#: 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:418
+msgid "php.ini check -> magic_quotes_gpc"
+msgstr ""
+
+#: 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:658
+msgid "You've to specify an ldap server before continuing!"
+msgstr ""
+
+#: 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: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:769
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
+msgstr ""
+
+#: 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: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:865
+#, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr ""
+
+#: 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 ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"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/setup_checks.inc:385
-msgid "PHP.ini check -> implicit_flush"
+#: 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/setup_checks.inc:386
-msgid ""
-"This Option defines the Ouput handling, turn this Option off, to increase "
-"performance."
+#: include/class_ldap.inc:644
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/setup_checks.inc:392
-msgid "PHP.ini check -> max_execution_time"
+#: include/class_ldap.inc:660
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/setup_checks.inc:393
-msgid ""
-"The Execution time, should be 30 seconds minimun, cause some actions will "
-"need huge ammount of time ."
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/setup_checks.inc:399
-msgid "PHP.ini check -> memory_limit"
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/setup_checks.inc:400
-msgid ""
-"GOsa need at least 8M of memory, less will cause unpredictable errors, "
-"sometimes without error message!. Best would be 32 M here."
+#: include/class_config.inc:426
+msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/setup_checks.inc:404
-msgid "PHP.ini check -> expose_php"
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/setup_checks.inc:405
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"PHP won't send any Information about the Server you are running, should be a "
-"security fact."
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
 
-#: include/setup_checks.inc:409
-msgid "PHP.ini check -> magic_quotes_gpc"
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
 msgstr ""
 
-#: include/setup_checks.inc:410
-msgid "Security option, php will escape all quotes in strings ."
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/setup_checks.inc:712
-msgid "You've to specify an ldap server before continuing!"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/setup_checks.inc:722 include/setup_checks.inc:825
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/setup_checks.inc:739 include/setup_checks.inc:837
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that is reachable "
-"for GOsa."
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
 msgstr ""
 
-#: include/setup_checks.inc:831
-msgid ""
-"Can't bind to the specified LDAP server!. Please make sure that is reachable "
-"for GOsa."
+#: html/helpviewer.php:85
+msgid "previous"
 msgstr ""
 
-#: include/setup_checks.inc:851
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
+#: html/helpviewer.php:89
+msgid "next"
 msgstr ""
 
-#: include/setup_checks.inc:890
+#: html/helpviewer.php:141
 #, php-format
 msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-
-#: include/setup_checks.inc:927
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
-#: include/setup_checks.inc:1053 include/setup_checks.inc:1071
-#: html/index.php:160 ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 
 #: html/getfax.php:53
@@ -6035,69 +6510,126 @@ 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:75
+#: html/setup.php:86
 #, php-format
 msgid ""
 "Directory '%s' specified as smarty compile directory is not accessable, "
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: html/main.php:100
+#: html/main.php:96
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:143
+#: html/main.php:139
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:261
+#: html/main.php:263
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/index.php:57
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
+#: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:79
+#: html/index.php:75
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 
-#: html/index.php:168
+#: html/index.php:148
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:156
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:184
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:170
+#: html/index.php:186
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:177
+#: html/index.php:193
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Enter SSL session"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/classic/conflict.tpl:2
-#: ihtml/themes/default/conflict.tpl:2
+#: 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"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+msgid ""
+"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
 msgid "Session conflict detected"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/classic/conflict.tpl:6
-#: ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -6105,15 +6637,13 @@ msgid ""
 "possible. Pressing the <b>Logout</b> button will close this session."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/classic/conflict.tpl:10
-#: ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/classic/conflict.tpl:14
-#: ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
 msgid "Logout"
 msgstr ""
 
@@ -6133,80 +6663,41 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:14 ihtml/themes/classic/login.tpl:14
-#: ihtml/themes/default/login.tpl:14
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:25 ihtml/themes/altlinux/login.tpl:29
-#: ihtml/themes/classic/login.tpl:25 ihtml/themes/classic/login.tpl:29
-#: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:25 ihtml/themes/default/login.tpl:29
-msgid "Username"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:43 ihtml/themes/altlinux/login.tpl:46
-#: ihtml/themes/classic/login.tpl:43 ihtml/themes/classic/login.tpl:46
-#: ihtml/themes/default/login.tpl:43 ihtml/themes/default/login.tpl:46
-msgid "Directory"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:24 ihtml/themes/classic/login.tpl:54
-#: ihtml/themes/default/login.tpl:54
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/classic/login.tpl:55
-#: ihtml/themes/default/login.tpl:55
-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 int 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
-#: ihtml/themes/classic/framework.tpl:14 ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/classic/framework.tpl:16 ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/classic/framework.tpl:18 ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/classic/framework.tpl:23 ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/classic/islocked.tpl:2
-#: ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
 
@@ -6233,12 +6724,6 @@ msgid ""
 "correct minimum version."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:11
-msgid ""
-"We've inspected the webserver side now. Your setup seems to fit GOsa's "
-"needs. Lets go for the GOsa configuration part now..."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6249,39 +6734,49 @@ msgid ""
 "is organized will be asked later on."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:7
-msgid "Please enter the server URI"
+#: ihtml/themes/altlinux/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"<i>(Example: ldap://your.server:389).</i>"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2
+msgid ""
+"The following fields allow the basic configuration of GOsa's behaviour and "
+"affect various properties in your main configuration."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:4
+#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:8
+#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:14
+#: ihtml/themes/altlinux/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
-"Finally, you need to specify parameters to access the LDAP server. GOsa "
-"always acts as admin and manages access rights internally. This is a "
+"GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:19
+#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
+#: ihtml/themes/altlinux/setup_step4.tpl:27
 #: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:29
+#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -6289,131 +6784,143 @@ msgid ""
 "values below if the fit your needs."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
+#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
-msgid "People storage ou"
+msgid "Base "
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:38
+#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
+msgid "People storage ou"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:46
-#: ihtml/themes/default/setup_step4.tpl:51
+#: ihtml/themes/altlinux/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:50
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/altlinux/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:56
-#: ihtml/themes/default/setup_step4.tpl:95
-msgid "Check"
+#: ihtml/themes/altlinux/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
+msgid ""
+"GOsa supports several encryption types for your passwords. Normally this is "
+"adjustable via user templates, but you can specify a default method to be "
+"used here, too."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
+#: ihtml/themes/altlinux/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
+msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:4
-#: ihtml/themes/default/setup_finish.tpl:14
+#: ihtml/themes/altlinux/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:20
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
+#: ihtml/themes/altlinux/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
+msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:22
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: 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/classic/islocked.tpl:9
-msgid ""
-"If this is lock detection is false, the other person has obviously closed "
-"the webbrowser during the edit operation. You may delete the lockfile in "
-"this case by pressing the <i>Remove</i> button."
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+msgid "Display PHP errors"
 msgstr ""
 
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+msgid "true"
 msgstr ""
 
-#: 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/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+msgid "false"
 msgstr ""
 
-#: ihtml/themes/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
+#: ihtml/themes/altlinux/setup_step4.tpl:115
+#: ihtml/themes/default/setup_step4.tpl:115
+msgid "Check"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:2
-msgid ""
-"The following fields allow the basic configuration of GOsa's behaviour and "
-"affect various properties in your main configuration."
+#: ihtml/themes/altlinux/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/altlinux/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:63
-msgid ""
-"GOsa supports several encryption types for your passwords. Normally this is "
-"adjustable via user templates, but you can specify a default method to be "
-"used here, too."
+#: ihtml/themes/altlinux/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:68
-msgid "Encryption algorithm"
+#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:79
+#: ihtml/themes/altlinux/setup_finish.tpl:14
+#: ihtml/themes/default/setup_finish.tpl:14
 msgid ""
-"GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling for quotas. You can "
-"choose the dummy plugin to leave all your mail settings untouched."
+"GOsa setup has collected all data needed to create an initial configuration "
+"file. Save the the link below as your gosa.conf and place that file in /etc/"
+"gosa. Change it as needed."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:84
-msgid "Mail method"
+#: ihtml/themes/altlinux/setup_finish.tpl:17
+#: ihtml/themes/default/setup_finish.tpl:17
+msgid "Download configuration"
 msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:3
+#: ihtml/themes/altlinux/setup_finish.tpl:20
+#: ihtml/themes/default/setup_finish.tpl:20
 msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
+"After placing the file under /etc/gosa, place make sure that the webserver "
+"user is able to read gosa.conf, while other users shouldn't. You may want to "
+"execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:17
-msgid "Download configuration"
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/setup_step4.tpl:100
+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 ""