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

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index c856a1a1d50cfa2f285da13f899078aaa5a0aa29..1a66d9856b8e2b25520df3ba9034552c14147714 100644 (file)
--- 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,28 +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 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 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
@@ -52,7 +54,7 @@ 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
@@ -67,221 +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:142 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:143 plugins/personal/mail/generic.tpl:111
-#: plugins/addons/ldapmanager/contentimport.tpl:53
+#: 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:144
+#: contrib/gosa.conf:153
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:159
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:176
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:181
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:182
+#: contrib/gosa.conf:192
 msgid "Italian"
 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_pureftpdAccount.inc:7
-#: 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_oxchangeAccount.inc:7
-#: 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
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:189
-msgid "This account has no mail extensions."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:197
-#: plugins/admin/groups/class_groupMail.inc:187
-msgid "Remove mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:198
-#: 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/admin/groups/class_groupMail.inc:190
-msgid "Create mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:201
-#: 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
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:255
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:30
+msgid "Display addresses of department"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:305
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
+#: 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/class_mailAccount.inc:670
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:674
-#: plugins/personal/mail/class_mailAccount.inc:678
-#: plugins/addons/addressbook/class_addressbook.inc:566
-msgid "Please enter a valid email address in 'Primary address' field."
+#: 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/class_mailAccount.inc:685
-#: plugins/admin/groups/class_groupMail.inc:619
-msgid "The primary address you've entered is already in use."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:691
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
+#: 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/class_mailAccount.inc:700
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
+#: 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/class_mailAccount.inc:710
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
+#: 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 ""
 
@@ -299,7 +306,7 @@ msgid "Quota usage"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:139
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not defined"
 msgstr ""
 
@@ -312,63 +319,40 @@ msgid "Alternative addresses"
 msgstr ""
 
 #: 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:56 plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/generic.tpl:63
-#: plugins/personal/posix/generic.tpl:125
-#: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:199
-#: plugins/personal/connectivity/kolab.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:60
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
-#: plugins/gofon/phoneaccount/generic.tpl:45
-msgid "Add"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/generic.tpl:127
+#: 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:77
 #: plugins/gofax/faxaccount/lists.tpl:13
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
-#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/headpage.tpl:18
-#: plugins/admin/groups/remove.tpl:15 plugins/admin/groups/generic.tpl:90
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
-#: plugins/admin/applications/remove.tpl:14
+#: plugins/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/departments/remove.tpl:15
+#: plugins/admin/applications/remove.tpl:14
 #: plugins/admin/departments/headpage.tpl:18
+#: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
+#: plugins/admin/systems/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/generic.tpl:39
-#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:18
-#: plugins/gofon/phoneaccount/generic.tpl:47
+#: 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 ""
 
@@ -453,61 +437,22 @@ 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/generic_certs.tpl:60
-#: plugins/personal/generic/main.inc:158
+#: 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:74
+#: 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:505
+#: 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:271
+#: 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:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:74
-#: 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/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:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:507
-#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:442
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:273
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
 #: plugins/personal/connectivity/main.inc:126
@@ -519,7 +464,7 @@ 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/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
@@ -527,7 +472,7 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:17
 #: plugins/admin/departments/headpage.tpl:17
 #: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/main.inc:112
+#: plugins/gofon/macro/headpage.tpl:17 plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr ""
 
@@ -535,71 +480,185 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: 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_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: 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"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:30
-msgid "Display addresses of department"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/blocklists/headpage.tpl:57
-#: 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:70
-#: plugins/admin/applications/headpage.tpl:49
-#: plugins/admin/departments/headpage.tpl:47
-#: plugins/admin/systems/headpage.tpl:62
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:62
-msgid "Choose the department the search will be based on"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
+#: plugins/personal/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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
+#: 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: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:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: 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: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: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: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: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: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:710
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: 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: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/class_mailAccount.inc:733
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
+#: plugins/personal/password/changed.tpl:2
+#: plugins/personal/password/password.tpl:2
+msgid "Change password"
+msgstr ""
+
+#: plugins/personal/password/changed.tpl:6
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr ""
+
+#: plugins/personal/password/changed.tpl:12
+#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc: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:35
-#: ihtml/themes/altlinux/login.tpl:39 ihtml/themes/default/login.tpl:35
-#: ihtml/themes/default/login.tpl:39
+#: 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: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:20
+#: plugins/admin/users/headpage.tpl:20 plugins/admin/users/password.tpl:21
 #: plugins/admin/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr ""
@@ -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:48
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 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:99
-#: 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 "
@@ -671,14 +711,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:176
+#: plugins/admin/users/class_userManagement.inc:174
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:179
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -698,18 +738,63 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems 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/trust_machines.tpl:26
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of department"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:71
-msgid "Display systems matching"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:6
@@ -717,7 +802,7 @@ msgid "Select groups to add"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:36
+#: plugins/gofax/blocklists/headpage.tpl:37
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
 #: plugins/admin/groups/headpage.tpl:38
@@ -725,9 +810,9 @@ msgstr ""
 #: plugins/admin/users/headpage.tpl:39
 #: plugins/admin/applications/headpage.tpl:37
 #: plugins/admin/departments/headpage.tpl:37
-#: plugins/admin/systems/headpage.tpl:37
+#: plugins/admin/systems/headpage.tpl:37 plugins/admin/ogroups/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:38
+#: plugins/gofon/macro/headpage.tpl:37
 msgid "Filters"
 msgstr ""
 
@@ -782,17 +867,17 @@ msgid "Show functional groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:61
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
 msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:66
+#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
 msgid "Regular expression for matching group names"
 msgstr ""
 
@@ -815,63 +900,18 @@ msgstr ""
 msgid "Password expires on"
 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:620
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:38
-msgid "Force UID/GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:40
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:45
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:54
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:56
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:74
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:88
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:91
-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
@@ -884,7 +924,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/personal/posix/class_posixAccount.inc:950
 msgid "Group of user"
 msgstr ""
 
@@ -894,7 +934,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:190
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:99
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
 msgid "automatic"
 msgstr ""
 
@@ -954,7 +994,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -965,7 +1005,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -976,7 +1016,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -987,7 +1027,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -998,7 +1038,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1009,7 +1049,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1020,7 +1060,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1031,7 +1071,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1042,7 +1082,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1053,7 +1093,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1064,7 +1104,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1075,95 +1115,96 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: 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:538
-#: plugins/personal/samba/class_sambaAccount.inc:449
+#: 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:538
+#: plugins/personal/posix/class_posixAccount.inc:541
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:539
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:707
+#: plugins/personal/posix/class_posixAccount.inc:710
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:855
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:866
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:873
+#: 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:876
+#: 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:885
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:890
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:898
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:909
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:912
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:917
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1019
+#: 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 ""
@@ -1178,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:621
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr ""
 
@@ -1227,17 +1268,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:116
-#: plugins/personal/samba/class_sambaAccount.inc:628
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:629
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:630
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr ""
 
@@ -1341,199 +1382,202 @@ msgid ""
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/samba/class_sambaAccount.inc:451
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:452
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:453
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:458
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:623
+#: 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:633
+#: 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:639
+#: 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:816
+#: 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:841
+#: 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/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:233
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:233
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:235
+#: plugins/personal/generic/class_user.inc:243
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:264
+#: 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:358
+#: plugins/personal/generic/class_user.inc:367
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:362
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/admin/systems/class_terminalInfo.inc:53
-#: plugins/admin/systems/class_terminalInfo.inc:170
-msgid "present"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
-#: plugins/personal/generic/class_user.inc:389
-msgid "absent"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:778
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr ""
+
+#: 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:795
+#: plugins/personal/generic/class_user.inc:825
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:836
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:846
+#: 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:851
+#: 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:857
-#: plugins/addons/addressbook/class_addressbook.inc:523
-#: plugins/admin/users/class_userManagement.inc:424
+#: 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:866
+#: 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:872
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:427
+#: 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:875
+#: plugins/personal/generic/class_user.inc:905
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:882
+#: 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:889
+#: 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:892
+#: plugins/personal/generic/class_user.inc:922
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:895
-#: plugins/personal/generic/class_user.inc:923
-#: plugins/addons/addressbook/class_addressbook.inc:533
-#: plugins/addons/addressbook/class_addressbook.inc:561
+#: 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:898
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:558
+#: 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:903
-#: plugins/personal/generic/class_user.inc:906
-#: plugins/addons/addressbook/class_addressbook.inc:541
+#: 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:909
-#: plugins/addons/addressbook/class_addressbook.inc:547
+#: 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:912
-#: plugins/addons/addressbook/class_addressbook.inc:550
+#: 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:915
-#: plugins/addons/addressbook/class_addressbook.inc:553
+#: 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/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."
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:6
@@ -1552,15 +1596,15 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:20
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:500
-#: 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:500
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr ""
@@ -1597,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 ""
 
@@ -1632,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 ""
 
@@ -1759,6 +1804,13 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+
 #: plugins/personal/generic/generic_picture.tpl:23
 msgid "Remove picture"
 msgstr ""
@@ -1768,33 +1820,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:14
-msgid "Standard certificate"
-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:202
-#: plugins/admin/groups/class_groupMail.inc:408
-#: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:213
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
-msgid "Remove"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl:25
-msgid "S/MIME certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl:36
-msgid "PKCS12 certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl:48
-msgid "Certificate serial number"
-msgstr ""
-
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr ""
@@ -1803,33 +1828,35 @@ msgstr ""
 msgid "Generic user information"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: 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/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/generic/generic_certs.tpl:28
+msgid "S/MIME certificate"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/generic/generic_certs.tpl:48
+msgid "PKCS12 certificate"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/generic/generic_certs.tpl:65
+msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:16
@@ -1852,71 +1879,63 @@ msgstr ""
 msgid "per"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:176
-msgid "Anonymous"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
-msgid "The value specified as Free Busy future needs to be an integer."
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:233
-msgid "The value specified as Free Busy Information URL is invalid."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:247
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:255
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr ""
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr ""
@@ -1931,179 +1950,306 @@ msgstr ""
 msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:23
 msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:24
 msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:31
+#: plugins/personal/connectivity/kolab.tpl:32
 msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:34
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:38
-msgid "Future"
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "KB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "GB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "hour"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "day"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "week"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
+msgid "Numerical value for Quota Setting is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+msgid ""
+"You're trying to add an invalid email address to the list of delegations."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
+msgid ""
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:44
-msgid "Invitation policy"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:6
-msgid "Open-Xchange"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:664
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:735
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:668
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:672
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:743
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: 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/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: 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/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: 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/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: 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/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: 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/oxchange.tpl:13
-msgid "Remember"
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: 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/oxchange.tpl:33
-msgid "User Information"
+#: 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/oxchange.tpl:37
-msgid "User Timezone"
+#: 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/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
+#: 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/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
+#: plugins/gofax/blocklists/headpage.tpl:46
+msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
+#: plugins/gofax/blocklists/headpage.tpl:47
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
+#: plugins/gofax/blocklists/headpage.tpl:55
+msgid "Display lists of department"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
+#: plugins/gofax/blocklists/headpage.tpl:69
+msgid "Display lists matching"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
+#: plugins/gofax/blocklists/headpage.tpl:72
+msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
+#: plugins/gofax/blocklists/headpage.tpl:80
+msgid "Display lists containing"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
+#: plugins/gofax/blocklists/headpage.tpl:83
+msgid "Show lists containing entered numbers"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2118,46 +2264,37 @@ msgstr ""
 msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:31
+#: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/functions.inc:1605
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:33
+#: plugins/gofax/blocklists/generic.tpl:34
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:39 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:24
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
 #: plugins/admin/systems/printer.tpl:10
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:54
+#: plugins/gofax/blocklists/generic.tpl:56
 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: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
-msgid "Information"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:66
+#: plugins/gofax/blocklists/generic.tpl:69
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
@@ -2211,9 +2348,10 @@ msgstr ""
 #: 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/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 ""
 
@@ -2226,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: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
-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:54
-msgid "Display lists of department"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:67
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:70
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:78
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:81
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2397,8 +2473,8 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1190
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1194
 msgid "Apply"
 msgstr ""
 
@@ -2432,77 +2508,35 @@ 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/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:18
-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 ""
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
+msgid ""
+"This account has fax features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
+msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
+msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
+msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
+#: 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
@@ -2535,10 +2569,14 @@ msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:21
 #: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+msgid "User"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2553,12 +2591,60 @@ msgstr ""
 msgid "Receiver"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr ""
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr ""
@@ -2588,10 +2674,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -2662,13 +2744,20 @@ msgid "Dial connection..."
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:357
-#: plugins/addons/addressbook/class_addressbook.inc:364
-#: plugins/addons/addressbook/class_addressbook.inc:368
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: 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 ""
@@ -2708,13 +2797,6 @@ msgstr ""
 msgid "Country"
 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 ""
@@ -2723,86 +2805,91 @@ msgstr ""
 msgid "Addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:147
+#: plugins/addons/addressbook/class_addressbook.inc:149
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:151
+#: 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:180
-#: plugins/addons/addressbook/class_addressbook.inc:284
+#: 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:278
+#: 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:374
+#: plugins/addons/addressbook/class_addressbook.inc:376
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:378
+#: plugins/addons/addressbook/class_addressbook.inc:380
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:462
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "organizations user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:471
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:500
+#: 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:501
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:501
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:574
+#: 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:586
+#: 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"
@@ -2837,20 +2924,20 @@ msgstr ""
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:299
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
-#: plugins/addons/ldapmanager/class_csvimport.inc:315
-#: plugins/addons/ldapmanager/class_import.inc:58
-#: plugins/addons/ldapmanager/class_import.inc:66
+#: plugins/addons/ldapmanager/class_csvimport.inc:302
+#: plugins/addons/ldapmanager/class_csvimport.inc:313
+#: plugins/addons/ldapmanager/class_csvimport.inc:318
+#: plugins/addons/ldapmanager/class_import.inc:59
+#: plugins/addons/ldapmanager/class_import.inc:67
 msgid "There is no file uploaded."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:304
-#: plugins/addons/ldapmanager/class_import.inc:51
+#: plugins/addons/ldapmanager/class_csvimport.inc:307
+#: plugins/addons/ldapmanager/class_import.inc:52
 msgid "The specified file is empty."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:442
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -2875,11 +2962,11 @@ msgstr ""
 msgid "Modify existing attributes"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:37
+#: plugins/addons/ldapmanager/contentimport.tpl:33
 msgid "Overwrite existing entry"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:40
 msgid "Import successful"
 msgstr ""
 
@@ -2919,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 ""
 
@@ -2959,11 +3046,6 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr ""
@@ -2976,6 +3058,10 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr ""
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr ""
@@ -3063,53 +3149,29 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:141
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Samba group"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Domain admins"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Domain users"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:254
-msgid "Domain guests"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:259
-#, php-format
-msgid "Special group (%d)"
+#: 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/class_groupGeneric.inc:574
-#: plugins/admin/ogroups/class_ogroup.inc:490
-msgid "You have no permissions to create a group on this 'Base'."
+#: 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/class_groupGeneric.inc:584
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
+msgid "Dive into LDAP subtrees when searching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:595
-#: plugins/admin/groups/class_groupGeneric.inc:602
-msgid "Value specified as 'Name' is already used."
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
+msgid "Search in subtrees"
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11
@@ -3136,29 +3198,10 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: 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
+#: plugins/admin/groups/remove.tpl:7
 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:64
-msgid "Dive into LDAP subtrees when searching"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:64
-msgid "Search in subtrees"
+"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
@@ -3180,58 +3223,49 @@ msgstr ""
 msgid "You are not allowed to delete this group!"
 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/application_options.tpl:1
-msgid "Application options"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:153
-msgid "read"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:154
-msgid "post"
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:155
-msgid "external post"
+#: plugins/admin/groups/class_groupGeneric.inc:141
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:156
-msgid "append"
+#: plugins/admin/groups/class_groupGeneric.inc:253
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:157
-msgid "write"
+#: plugins/admin/groups/class_groupGeneric.inc:253
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:179
-msgid "This 'dn' has no valid mail extensions."
+#: plugins/admin/groups/class_groupGeneric.inc:253
+msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:244
-msgid "You're trying to add an invalid email address "
+#: plugins/admin/groups/class_groupGeneric.inc:254
+msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:245
-msgid "to the list of forwarders."
+#: plugins/admin/groups/class_groupGeneric.inc:259
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
-msgid "Please enter a valid email addres in 'Primary address' field."
+#: 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/acl.tpl:4
-msgid "Object"
+#: plugins/admin/groups/class_groupGeneric.inc:584
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: 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/application.tpl:4
@@ -3250,31 +3284,16 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: 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:69
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/users/headpage.tpl:73
-msgid "Display users matching"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:31
-#: plugins/admin/users/headpage.tpl:74
-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
@@ -3321,8 +3340,35 @@ 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
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:61
@@ -3357,77 +3403,49 @@ msgstr ""
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
-msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
-msgstr ""
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr ""
-
-#: 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."
+#: plugins/admin/groups/class_groupMail.inc:153
+msgid "read"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:619
-msgid "Template"
+#: plugins/admin/groups/class_groupMail.inc:154
+msgid "post"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:44
-#: 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"
+#: plugins/admin/groups/class_groupMail.inc:155
+msgid "external post"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/groups/class_groupMail.inc:156
+msgid "append"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
+#: plugins/admin/groups/class_groupMail.inc:157
+msgid "write"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:159
-#: plugins/admin/users/class_userManagement.inc:210
-msgid "You are not allowed to set this users password!"
+#: plugins/admin/groups/class_groupMail.inc:179
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:246
-#, php-format
-msgid "You're about to delete the user %s."
+#: plugins/admin/groups/class_groupMail.inc:244
+msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:252
-#: plugins/admin/users/class_userManagement.inc:280
-msgid "You are not allowed to delete this user!"
+#: plugins/admin/groups/class_groupMail.inc:245
+msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:370
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "none"
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:436
-msgid "A person with the choosen name is already used in this tree."
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"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
@@ -3499,20 +3517,107 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:54
-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/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: 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/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/headpage.tpl:6
+msgid "List of applications"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:29
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:32
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you in editing "
+"properties. -Delete- will ask for confirmation before removing applications."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:54
-msgid "Show FTP users"
+#: plugins/admin/applications/headpage.tpl:46
+msgid "Display applications of department"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:55
-msgid "Select to see users that have FAX settings"
+#: plugins/admin/applications/headpage.tpl:58
+msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:55
-msgid "Show FAX users"
+#: plugins/admin/applications/headpage.tpl:61
+msgid "Regular expression for matching application names"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -3521,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"
@@ -3532,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 ""
 
@@ -3593,6 +3699,7 @@ msgid "Variable"
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr ""
 
@@ -3605,44 +3712,39 @@ msgstr ""
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:7
+#: 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/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:29
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:59
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:148
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:46
-msgid "Display applications of department"
+#: plugins/admin/applications/class_applicationGeneric.inc:229
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:58
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:234
+msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:61
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:237
+msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:246
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:185
@@ -3655,28 +3757,34 @@ msgstr ""
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:59
-msgid "This 'dn' is no application."
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:148
-msgid "The specified picture has not been uploaded correctly."
+#: 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/applications/class_applicationGeneric.inc:229
-msgid "You have no permissions to create a application on this 'Base'."
+#: 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/applications/class_applicationGeneric.inc:234
-msgid "Required field 'Name' is not filled."
+#: plugins/admin/departments/headpage.tpl:45
+msgid "Display subdepartments of"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:237
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/departments/headpage.tpl:56
+msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:246
-msgid "There's already an application with this 'Name'."
+#: plugins/admin/departments/headpage.tpl:59
+msgid "Regular expression for matching department names"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:4
@@ -3743,38 +3851,29 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:29
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
 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."
+#: plugins/admin/departments/class_departmentGeneric.inc:129
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Display subdepartments of"
+#: plugins/admin/departments/class_departmentGeneric.inc:136
+#: plugins/admin/departments/class_departmentGeneric.inc:138
+msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:56
-msgid "Display departments matching"
+#: plugins/admin/departments/class_departmentGeneric.inc:146
+msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:59
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentGeneric.inc:151
+msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
+#: plugins/admin/departments/class_departmentGeneric.inc:152
+msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
@@ -3791,25 +3890,21 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:129
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:136
-#: plugins/admin/departments/class_departmentGeneric.inc:138
-msgid "Department with that 'Name' already exists."
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:146
-msgid "Required field 'Description' is not set."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:151
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:152
-msgid " Please choose another name."
+#: plugins/admin/systems/class_terminalInfo.inc:53
+#: plugins/admin/systems/class_terminalInfo.inc:178
+msgid "present"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:62
@@ -3823,74 +3918,56 @@ msgstr ""
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:83
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:133
+#: plugins/admin/systems/class_terminalInfo.inc:141
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:136
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:152
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:162
+#: plugins/admin/systems/class_terminalInfo.inc:170
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr ""
-
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:116
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:142
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:119
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:149
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:159
-#: 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:136
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -3989,40 +4066,112 @@ msgstr ""
 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/servservice.tpl:11
-msgid "Nfs Export"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: 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/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl: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/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:83
@@ -4063,42 +4212,10 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:127
-#: plugins/admin/systems/class_servDB.inc:143
-#: plugins/admin/systems/class_servDB.inc:149
-#: plugins/admin/systems/class_servDB.inc:154
-#: plugins/admin/systems/class_servDB.inc:160
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:133
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:137
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
 #: plugins/admin/systems/server.tpl:6
 msgid "Server 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"
-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"
-msgstr ""
-
 #: plugins/admin/systems/server.tpl:42
 msgid "Select action to execute for this server"
 msgstr ""
@@ -4107,67 +4224,28 @@ msgstr ""
 msgid "Phone name"
 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"
+#: plugins/admin/systems/class_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -4183,7 +4261,7 @@ msgstr ""
 #: 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 ""
 
@@ -4196,9 +4274,9 @@ msgstr ""
 #: 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 ""
@@ -4206,35 +4284,35 @@ msgstr ""
 #: 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: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:144
 #: plugins/admin/systems/class_servGeneric.inc:112
 #: plugins/admin/systems/class_workstationGeneric.inc:152
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr ""
 
 #: 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:91
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr ""
 
 #: 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:91
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr ""
 
@@ -4278,18 +4356,6 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr ""
-
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr ""
@@ -4344,12 +4410,80 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl: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
@@ -4370,14 +4504,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr ""
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -4438,234 +4564,282 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:88
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:88
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:91
-msgid "Add Kolab service"
+#: 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/class_servKolab.inc:91
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:119
+#: plugins/admin/systems/class_servDB.inc:172
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:125
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:197
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/headpage.tpl:29
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/headpage.tpl:32
+msgid ""
+"-Edit- will execute an assistant to aid you in changing the system "
+"properties. -Delete- will ask for confirmation before deleting systems."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:203
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:205
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:207
-msgid "Future days must be a value."
+#: plugins/admin/systems/headpage.tpl:47
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:211
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:215
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/headpage.tpl:48
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/headpage.tpl:49
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/headpage.tpl:49
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/headpage.tpl:51
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/headpage.tpl:74
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/headpage.tpl:82
+msgid "Display terminal(s) of user"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/headpage.tpl:85
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: 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/servkolab.tpl:136
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:142
-msgid "Enable MX lookup for relayhost"
+#: 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/servkolab.tpl:147
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
-msgid "Accept Internet Mail"
+#: 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/servkolab.tpl:167
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: 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/wingeneric.tpl:6
-msgid "Machine name"
+#: 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/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_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/headpage.tpl:6
-msgid "List of systems"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:29
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:32
-msgid ""
-"-Edit- will execute an assistant to aid you in changing the system "
-"properties. -Delete- will ask for confirmation before deleting systems."
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
+#: 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/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:47
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:47
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:48
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:49
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:49
-msgid "Show windows based workstations"
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Select to see network printers"
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Show network printers"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Select to see network devices"
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Show network devices"
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:74
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/phonesettings.tpl:212
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:82
-msgid "Display terminal(s) of user"
+#: 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/headpage.tpl:85
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:4
@@ -4713,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 ""
 
@@ -4830,20 +5005,14 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:272
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
 #: plugins/admin/systems/chooser.tpl:1
@@ -4888,6 +5057,10 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr ""
+
 #: plugins/admin/systems/startup.tpl:1
 msgid "Boot parameters"
 msgstr ""
@@ -4966,26 +5139,112 @@ msgstr ""
 msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:48
+#: plugins/admin/systems/class_phoneGeneric.inc:104
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:110
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+msgid "yes"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+msgid "no"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "dynamic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "Networksettings"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:263
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:266
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:126
+#: plugins/admin/systems/class_phoneGeneric.inc:275
+msgid "Wrong IP format in field IP-address."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "You have no permissions to create a phone on this 'Base'."
 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/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr ""
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr ""
 
+#: 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/ogroups/headpage.tpl:48
+msgid "Show groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:49
+msgid "Show groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:50
+msgid "Show groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Show groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:52
+msgid "Show groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:53
+msgid "Show groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:54
+msgid "Show groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:55
+msgid "Show groups containing printers"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
@@ -5054,244 +5313,356 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr ""
+
+#: 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:155
+#: plugins/admin/ogroups/class_ogroupManagement.inc:181
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:91
+msgid "This 'dn' is no object group."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "too many different objects!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:209
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:214
+msgid "phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:215
+msgid "printers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:222
+msgid "and"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:369
+msgid "Non existing dn: "
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:500
+msgid "Object groups need at least one member!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:505
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 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."
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:91
-msgid "This 'dn' is no object group."
+#: plugins/gofon/macro/headpage.tpl:29
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "too many different objects!"
+#: 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/class_ogroup.inc:207
-msgid "users"
+#: plugins/gofon/macro/headpage.tpl:46
+msgid "Display macros of department"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "groups"
+#: plugins/gofon/macro/headpage.tpl:59
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "applications"
+#: plugins/gofon/macro/headpage.tpl:62
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "departments"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "servers"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "workstations"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "terminals"
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
-msgid "phones"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:215
-msgid "printers"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:222
-msgid "and"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:369
-msgid "Non existing dn: "
+#: 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/admin/ogroups/class_ogroup.inc:500
-msgid "Object groups need at least one member!"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:505
-msgid "You can combine two different object types at maximum only!"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
+#: plugins/gofon/macro/class_gofonMacro.inc:80
+msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+msgid "String"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+msgid "Combobox"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:232
+msgid "Bool"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:238
+msgid "Delete unused"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:312
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:150
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:320
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
 #, php-format
-msgid "You're about to delete the object group '%s'."
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:182
-msgid "You are not allowed to delete this object group!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:325
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/gofon/macro/class_gofonMacro.inc:161
+#, php-format
+msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/gofon/macro/class_gofonMacro.inc:166
+msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: 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."
+#: plugins/gofon/macro/class_gofonMacro.inc:171
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show empty groups"
+#: plugins/gofon/macro/class_gofonMacro.inc:180
+msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:49
-msgid "Show groups containing users"
+#: plugins/gofon/macro/class_gofonMacro.inc:185
+msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:50
-msgid "Show groups containing groups"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Show groups containing applications"
+#: plugins/gofon/phoneaccount/generic.tpl:38
+msgid "Forward calls to"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Show groups containing departments"
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:53
-msgid "Show groups containing servers"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Timeout (s)"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:54
-msgid "Show groups containing workstations"
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:55
-msgid "Show groups containing terminals"
+#: plugins/gofon/phoneaccount/generic.tpl:75
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:56
-msgid "Show groups containing printers"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: 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:114
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:124
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:125
+#: 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:127
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:128
+#: 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:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:180
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:305
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
 #, php-format
-msgid "The number '%s' is no valid phone number!"
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:308
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:16
-msgid "Answering machine"
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:22
-#: plugins/gofon/phoneaccount/generic.tpl:25
-msgid "Deliver missed calls as mail"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:39
-msgid "Phone numbers"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
+#, php-format
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:56
-msgid "Forward calls to"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Phone number"
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Timeout (s)"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
 #: plugins/gofon/reports/class_fonreport.inc:6
@@ -5331,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 ""
@@ -5385,201 +5752,264 @@ 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 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:1464
+#: include/functions.inc:1468
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1509
+#: include/functions.inc:1511
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1556
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-
-#: include/functions.inc:1556
-msgid "Toggle information"
-msgstr ""
-
-#: include/functions.inc:1561
-msgid "PHP error"
-msgstr ""
-
-#: include/functions.inc:1572
-msgid "class"
-msgstr ""
-
-#: include/functions.inc:1578
-msgid "function"
-msgstr ""
-
-#: include/functions.inc:1583
-msgid "static"
-msgstr ""
-
-#: include/functions.inc:1587
-msgid "method"
-msgstr ""
-
-#: include/functions.inc:1604
-msgid "Trace"
-msgstr ""
-
-#: include/functions.inc:1605
-msgid "File"
-msgstr ""
-
-#: include/functions.inc:1605
-msgid "Line"
-msgstr ""
-
-#: include/functions.inc:1606
-msgid "Arguments"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:38
+#: 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:51
+#: 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:114
+#: 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:130
+#: 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:141
-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:176
+#: 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:198
+#: 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:226
+#: 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:239
+#: 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:310
+#: 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:314
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr ""
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr ""
+
+#: 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: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:450
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:162
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:199
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+
 #: include/class_pluglist.inc:98
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
@@ -5594,409 +6024,415 @@ msgid ""
 "changes?"
 msgstr ""
 
-#: include/setup_checks.inc:72
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
 
-#: include/setup_checks.inc:81 include/setup_checks.inc:90
+#: 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:110
+#: 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:114
+#: 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:118
+#: include/functions_setup.inc:145
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr ""
 
-#: include/setup_checks.inc:128
+#: include/functions_setup.inc:155
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 
-#: include/setup_checks.inc:132
+#: include/functions_setup.inc:159
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/setup_checks.inc:141
+#: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:146
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:151
+#: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:156
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:162
+#: include/functions_setup.inc:191
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:167
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/setup_checks.inc:172
+#: include/functions_setup.inc:201
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:177
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/setup_checks.inc:182
+#: include/functions_setup.inc:211
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:187
+#: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
 msgstr ""
 
-#: include/setup_checks.inc:192
+#: include/functions_setup.inc:221
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/setup_checks.inc:197
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/setup_checks.inc:204
+#: 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:212
+#: include/functions_setup.inc:240
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/setup_checks.inc:229
+#: include/functions_setup.inc:257
 msgid "OK"
 msgstr ""
 
-#: include/setup_checks.inc:232
+#: include/functions_setup.inc:260
 msgid "Ignored"
 msgstr ""
 
-#: include/setup_checks.inc:234
+#: include/functions_setup.inc:262
 msgid "Failed"
 msgstr ""
 
-#: include/setup_checks.inc:251
+#: include/functions_setup.inc:279
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/setup_checks.inc:252
+#: include/functions_setup.inc:280
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/setup_checks.inc:253
+#: 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:256
+#: include/functions_setup.inc:284
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/setup_checks.inc:257
+#: 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:260
+#: include/functions_setup.inc:288
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/setup_checks.inc:261
+#: include/functions_setup.inc:289
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/setup_checks.inc:264
+#: include/functions_setup.inc:292
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/setup_checks.inc:265
+#: include/functions_setup.inc:293
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/setup_checks.inc:268
+#: include/functions_setup.inc:296
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/setup_checks.inc:269
+#: include/functions_setup.inc:297
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/setup_checks.inc:271
+#: include/functions_setup.inc:299
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/setup_checks.inc:272
+#: 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:275
+#: include/functions_setup.inc:303
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/setup_checks.inc:276
+#: 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:279
+#: include/functions_setup.inc:307
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/setup_checks.inc:280
+#: 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:283
+#: include/functions_setup.inc:311
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/setup_checks.inc:284
+#: 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:287
+#: include/functions_setup.inc:315
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/setup_checks.inc:288
+#: include/functions_setup.inc:316
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/setup_checks.inc:291
+#: include/functions_setup.inc:319
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/setup_checks.inc:292
+#: 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:295
+#: include/functions_setup.inc:323
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/setup_checks.inc:296
+#: 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:299
+#: include/functions_setup.inc:327
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/setup_checks.inc:300
+#: include/functions_setup.inc:328
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/setup_checks.inc:309
+#: 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:360
+#: include/functions_setup.inc:388
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/setup_checks.inc:361
+#: include/functions_setup.inc:389
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/setup_checks.inc:364
+#: include/functions_setup.inc:392
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/setup_checks.inc:365
+#: include/functions_setup.inc:393
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/setup_checks.inc:372
+#: include/functions_setup.inc:400
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/setup_checks.inc:373
+#: include/functions_setup.inc:401
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/setup_checks.inc:380
+#: include/functions_setup.inc:408
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/setup_checks.inc:381
+#: 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/setup_checks.inc:385
+#: include/functions_setup.inc:413
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/setup_checks.inc:386
+#: 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/setup_checks.inc:390
+#: include/functions_setup.inc:418
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/setup_checks.inc:391
+#: 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/setup_checks.inc:629
+#: include/functions_setup.inc:658
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/setup_checks.inc:638 include/setup_checks.inc:720
+#: 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/setup_checks.inc:652 include/setup_checks.inc:725
-#: include/setup_checks.inc:730
+#: 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/setup_checks.inc:740
+#: 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/setup_checks.inc:796
+#: include/functions_setup.inc:825
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/setup_checks.inc:827
+#: 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/setup_checks.inc:924 include/setup_checks.inc:939
-#: html/index.php:160 ihtml/themes/default/setup_useradmin.tpl:6
+#: 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_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr ""
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
+#: include/class_ldap.inc:398
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: include/class_plugin.inc:386
+#: include/class_ldap.inc:631
 #, php-format
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: include/class_plugin.inc:412
+#: include/class_ldap.inc:644
 #, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_plugin.inc:438
+#: include/class_ldap.inc:660
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_config.inc:69
@@ -6004,7 +6440,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:195 html/index.php:142
+#: include/class_config.inc:195 html/index.php:140
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
@@ -6012,18 +6448,8 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_password-methods.inc:166
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-
-#: include/class_password-methods.inc:185
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#: 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
@@ -6040,32 +6466,36 @@ msgstr ""
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/class_ldap.inc:398
+#: include/functions_helpviewer.inc:335
 #, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_ldap.inc:630
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
 msgstr ""
 
-#: include/class_ldap.inc:643
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "next"
 msgstr ""
 
-#: include/class_ldap.inc:659
+#: html/helpviewer.php:141
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgstr ""
+
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 
 #: html/getfax.php:53
@@ -6080,59 +6510,71 @@ 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:264
+#: 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 ""
 
@@ -6159,6 +6601,30 @@ msgid ""
 "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 ""
@@ -6181,30 +6647,6 @@ msgstr ""
 msgid "Logout"
 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/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
-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/altlinux/setup_finish.tpl:24 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/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -6221,6 +6663,20 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -6241,6 +6697,17 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this 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."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -6257,23 +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/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr ""
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this 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."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6284,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 "
@@ -6324,128 +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 "Base "
+msgstr ""
+
+#: 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:38
+#: 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/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/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:100
-msgid "Check"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:4
-#: ihtml/themes/default/setup_finish.tpl:14
-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."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:20
+#: ihtml/themes/altlinux/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
 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:"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:22
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+"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/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:72
+#: ihtml/themes/default/setup_step4.tpl:72
+msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/altlinux/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
+"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/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_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
+msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:18
+#: ihtml/themes/altlinux/setup_step4.tpl:99
 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."
+"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/default/setup_step4.tpl:39
-msgid "Base "
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+msgid "Display PHP errors"
 msgstr ""
 
-#: 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."
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+msgid "true"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:72
-msgid "Encryption algorithm"
+#: ihtml/themes/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+msgid "false"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:83
-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."
+#: ihtml/themes/altlinux/setup_step4.tpl:115
+#: ihtml/themes/default/setup_step4.tpl:115
+msgid "Check"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:88
-msgid "Mail method"
+#: ihtml/themes/altlinux/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_finish.tpl:3
 #: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
 "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/altlinux/setup_finish.tpl:7
 #: ihtml/themes/default/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr ""
 
+#: ihtml/themes/altlinux/setup_finish.tpl:14
+#: ihtml/themes/default/setup_finish.tpl:14
+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."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:20
+#: 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:"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: 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 ""