update for the french locale

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 3bdc7a0e9e725e65d16447408335b0e4a0fd72b6..33222d1f545693333b8c18839a7f483e1d2f6cd2 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,15 +6,15 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:42
+#: contrib/gosa.conf:44
 msgid "Addons"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:59 contrib/gosa.conf:70 contrib/gosa.conf:78
+#: contrib/gosa.conf:84 contrib/gosa.conf:90 contrib/gosa.conf:98
+#: contrib/gosa.conf:107 contrib/gosa.conf:115 contrib/gosa.conf:120
+#: contrib/gosa.conf:125 contrib/gosa.conf:130 contrib/gosa.conf:135
+#: contrib/gosa.conf:140 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
@@ -24,153 +24,304 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:58
+#: contrib/gosa.conf:60
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:59 contrib/gosa.conf:70
+#: contrib/gosa.conf:61 contrib/gosa.conf:72
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/ogroups/tabs_ogroups.inc:29
+#: plugins/admin/groups/class_groupManagement.inc:373
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/ogroups/tabs_ogroups.inc:47
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:62 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:374
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:61
+#: contrib/gosa.conf:63 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
-#: plugins/personal/connectivity/main.inc:136
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:64 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
+#: contrib/gosa.conf:65 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/address_edit.tpl:41
-#: plugins/addons/addressbook/address_edit.tpl:89
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: 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
+#: contrib/gosa.conf:66 contrib/gosa.conf:74 contrib/gosa.conf:80
+#: contrib/gosa.conf:86 contrib/gosa.conf:94 contrib/gosa.conf:103
+#: contrib/gosa.conf:111 contrib/gosa.conf:116 contrib/gosa.conf:121
+#: contrib/gosa.conf:126 contrib/gosa.conf:131 contrib/gosa.conf:136
+#: contrib/gosa.conf:141
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:71
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:73
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:79 plugins/admin/ogroups/phonequeue.tpl:31
+#: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
+#: contrib/gosa.conf:85 plugins/gofon/phoneaccount/class_phoneAccount.inc:533
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:89 contrib/gosa.conf:106
+#: contrib/gosa.conf:91 contrib/gosa.conf:108
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:90 contrib/gosa.conf:107
+#: contrib/gosa.conf:92 contrib/gosa.conf:109
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
+#: contrib/gosa.conf:93 contrib/gosa.conf:102 contrib/gosa.conf:110
 msgid "Monitoring"
 msgstr ""
 
-#: contrib/gosa.conf:97
+#: contrib/gosa.conf:99
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:100 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:150 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:153 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:151 plugins/personal/mail/generic.tpl:111
+#: contrib/gosa.conf:154 plugins/personal/mail/generic.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:152
+#: contrib/gosa.conf:155
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:168
+#: contrib/gosa.conf:171
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:188 plugins/admin/ogroups/class_phonequeue.inc:160
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:189
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:190
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:191
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:192
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:193
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:194
 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:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.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/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+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:200
+msgid "This account has no mail extensions."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc: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:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: 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:709
+#: 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:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: 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:734
+#: 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:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -202,12 +353,12 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
@@ -218,8 +369,8 @@ msgstr ""
 #: 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/groups/group_objects.tpl:49
+#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
@@ -228,40 +379,35 @@ msgstr ""
 #: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
-#: plugins/gofon/phoneaccount/generic.tpl:11
+#: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:137
+#: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:289
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:18
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
 #: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/headpage.tpl:18 plugins/admin/groups/generic.tpl:90
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
+#: plugins/admin/groups/generic.tpl:90 plugins/admin/users/remove.tpl:15
 #: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/applications/headpage.tpl:18
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:18
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
-#: plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
+#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/headpage.tpl:18
-#: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/macro/headpage.tpl:18
+#: plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/conference/remove.tpl:15
 msgid "Delete"
 msgstr ""
 
@@ -294,341 +440,219 @@ msgstr ""
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:83
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:85
+#: plugins/personal/mail/generic.tpl:86
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:93
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:100
+#: plugins/personal/mail/generic.tpl:101
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:117
+#: plugins/personal/mail/generic.tpl:118
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/generic.tpl:129
 #: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:138
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:143
+#: plugins/personal/mail/generic.tpl:144
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "Use custom sieve script"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
 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_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: 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
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-msgid "This does something"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:611
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:261
+msgid "Finish"
 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."
+#: 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:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:613
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:529
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:86
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:263
+#: plugins/gofon/conference/remove.tpl:17
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
+msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
+#: 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/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/gofon/phoneaccount/main.inc:112
+msgid "Edit"
 msgstr ""
 
-#: 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"
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
 msgstr ""
 
-#: 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."
+#: 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: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:675
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:680
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:684
-#: plugins/personal/mail/class_mailAccount.inc:688
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:695
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:701
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:710
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:720
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/users/class_userManagement.inc:507
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:270
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
-msgid "Finish"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:509
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:442
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:272
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/blocklists/headpage.tpl:17
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
-#: plugins/admin/applications/headpage.tpl:17
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/main.inc:112 plugins/gofon/macro/headpage.tpl:17
-msgid "Edit"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:28
+msgid "Filters"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: 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/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
 msgid "Choose the department the search will be based on"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:42
+#: plugins/admin/groups/mail_locals.tpl:44
 msgid "Display addresses matching"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:31
 #: plugins/personal/posix/trust_machines.tpl:31
 #: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
+#: plugins/admin/groups/mail_locals.tpl:47
 msgid "Regular expression for matching addresses"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
+#: plugins/admin/groups/mail_locals.tpl:54
 msgid "Display addresses of user"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
+#: plugins/admin/groups/mail_locals.tpl:57
 msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: 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/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr ""
 
@@ -664,8 +688,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/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr ""
 
@@ -683,12 +706,12 @@ msgstr ""
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
@@ -708,14 +731,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:174
+#: plugins/admin/users/class_userManagement.inc:261
 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:179
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -735,47 +758,45 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:37
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:38
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:39
-#: plugins/admin/applications/headpage.tpl:37
-#: plugins/admin/departments/headpage.tpl:37
-#: plugins/admin/systems/headpage.tpl:37
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:37
-msgid "Filters"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:6
+msgid "Select groups to add"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:40
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:41
 msgid "Show primary groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:45
 msgid "Show samba groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have applications configured"
 msgstr ""
 
@@ -785,47 +806,46 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:52
 msgid "Select to see groups that have mail settings"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:53
 msgid "Show mail groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:56
 msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:57
 msgid "Show functional groups"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:71
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:72
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -833,25 +853,11 @@ msgstr ""
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:19
+#: plugins/personal/posix/posix_shadow.tpl:14
 #: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:225
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:26
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of department"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:71
-msgid "Display systems matching"
-msgstr ""
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -895,20 +901,16 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
@@ -916,47 +918,47 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:133
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:172
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:190
+#: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:207
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:218
+#: plugins/personal/posix/class_posixAccount.inc:219
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:238
-#: plugins/personal/posix/class_posixAccount.inc:241
+#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:242
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:240
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -987,7 +989,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -998,7 +1000,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1009,7 +1011,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1020,7 +1022,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1031,7 +1033,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1042,7 +1044,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1053,7 +1055,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1064,7 +1066,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1075,7 +1077,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1086,7 +1088,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1097,7 +1099,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1108,7 +1110,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
@@ -1135,77 +1137,73 @@ msgstr ""
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:868
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:879
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:876
-#: plugins/admin/groups/class_groupGeneric.inc:610
+#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:879
-#: plugins/admin/groups/class_groupGeneric.inc:613
+#: plugins/personal/posix/class_posixAccount.inc:886
+#: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:894
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/personal/posix/class_posixAccount.inc:899
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:897
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:913
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:921
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:926
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1021
-#: plugins/admin/groups/class_groupGeneric.inc:644
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr ""
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1332,6 +1330,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1344,10 +1346,6 @@ msgstr ""
 msgid "Display workstations matching"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr ""
@@ -1440,76 +1438,205 @@ msgid ""
 "possible!"
 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:233
+msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:107
-msgid "Save"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
+#: 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/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:503
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:503
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
-msgid "Login"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:26
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:50
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:58
-msgid "Date of birth"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:75
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
-msgid "Set"
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:529
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr ""
+
+#: plugins/personal/generic/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.tpl:6
+msgid "Personal information"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
+#: plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:23
+msgid "Given name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+msgid "Login"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:42
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:50
+msgid "Academic title"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:58
+msgid "Date of birth"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:75
+#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
+msgid "Set"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:81
 msgid "Sex"
 msgstr ""
 
@@ -1522,7 +1649,7 @@ msgstr ""
 #: plugins/admin/systems/workstation.tpl:18
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
 
@@ -1532,8 +1659,8 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:111
 #: plugins/personal/generic/generic.tpl:255
-#: plugins/addons/addressbook/address_edit.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:86
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:54
@@ -1578,8 +1705,16 @@ msgid "Organization"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:177
-#: plugins/addons/addressbook/address_edit.tpl:68
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/applications/class_applicationManagement.inc:354
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/ogroups/class_ogroupManagement.inc:414
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
@@ -1602,14 +1737,14 @@ msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:225
-#: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/address_edit.tpl:102
 #: plugins/addons/addressbook/address_info.tpl:91
 msgid "Pager"
 msgstr ""
@@ -1659,7 +1794,7 @@ msgid "Street"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:329
-#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_edit.tpl:81
 #: plugins/addons/addressbook/address_info.tpl:70
 msgid "Postal code"
 msgstr ""
@@ -1676,10 +1811,20 @@ msgstr ""
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:378
+#: plugins/personal/generic/generic.tpl:377
 msgid "Public visible"
 msgstr ""
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+#: plugins/admin/systems/servnfs.tpl:85
+msgid "Save"
+msgstr ""
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1690,7 +1835,6 @@ msgstr ""
 #: 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 ""
@@ -1707,149 +1851,37 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "female"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:231
-msgid "male"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:241
-msgid "This account has no valid GOsa extensions."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:365
-msgid "Please enter a valid serial number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:402
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:402
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:402
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:406
-msgid "No certificate installed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:800
-msgid "Kerberos database communication failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:817
-msgid "Can't remove user from kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:828
-msgid "Can't add user to kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:868
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:873
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:879
-#: plugins/addons/addressbook/class_addressbook.inc:526
-#: plugins/admin/users/class_userManagement.inc:425
-msgid "The required field 'Name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:888
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:428
-msgid "The required field 'Given name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:897
-msgid "The required field 'Login' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:904
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:911
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:914
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:539
-#: plugins/addons/addressbook/class_addressbook.inc:561
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/addons/addressbook/class_addressbook.inc:544
-#: plugins/addons/addressbook/class_addressbook.inc:547
-#: plugins/admin/departments/class_departmentGeneric.inc:158
-msgid "The field 'Phone' contains an invalid phone number."
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:931
-#: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/departments/class_departmentGeneric.inc:161
-msgid "The field 'Fax' contains an invalid phone number."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:553
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:937
-#: plugins/addons/addressbook/class_addressbook.inc:556
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1062
-msgid "Could not open specified certificate!"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
@@ -1872,7 +1904,7 @@ msgstr ""
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:79
+#: plugins/personal/connectivity/proxy.tpl:80
 msgid "per"
 msgstr ""
 
@@ -1937,33 +1969,56 @@ msgstr ""
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
+msgstr ""
+
+#: 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/webdav.tpl:1
+msgid "WebDAV account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
@@ -1983,68 +2038,20 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:774
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
 msgid "Couldn't Connect To Postgresql Database"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:778
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
 msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:782
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
-msgstr ""
-
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
-msgstr ""
-
-#: 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/webdav.tpl:1
-msgid "WebDAV account"
-msgstr ""
-
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr ""
@@ -2126,6 +2133,10 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_connectivity.inc:60
 msgid "This account has no connectivity extensions."
 msgstr ""
@@ -2135,82 +2146,40 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
+#: plugins/personal/connectivity/class_proxyAccount.inc:130
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
-msgid "You have no permission to remove this blocklist."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
-msgid "Please specify a valid phone number."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "send"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "receive"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
-#: plugins/admin/departments/class_departmentGeneric.inc:143
-msgid "Required field 'Name' is not set."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
-msgid "Required field 'Name' contains invalid characters"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
-msgid "Specified name is already used."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
-msgid "No permission to create a blocklist on this base."
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2227,7 +2196,8 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
+#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr ""
 
@@ -2241,8 +2211,9 @@ msgstr ""
 #: 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/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:51
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr ""
@@ -2256,13 +2227,14 @@ msgid "Blocked numbers"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:25
+#: plugins/gofax/blocklists/headpage.tpl:20
 #: 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
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr ""
 
@@ -2270,14 +2242,234 @@ msgstr ""
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+msgid "You have no permission to remove this blocklist."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+msgid "Please specify a valid phone number."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:348
+#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/applications/class_applicationManagement.inc:323
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:280
+msgid "Go up one department"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:348
+#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/applications/class_applicationManagement.inc:323
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:280
+msgid "Up"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/applications/class_applicationManagement.inc:324
+#: plugins/admin/departments/class_departmentManagement.inc:278
+#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:281
+msgid "Go to root department"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/applications/class_applicationManagement.inc:324
+#: plugins/admin/departments/class_departmentManagement.inc:278
+#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:281
+msgid "Root"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/applications/class_applicationManagement.inc:325
+#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:282
+msgid "Go to users department"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/applications/class_applicationManagement.inc:325
+#: plugins/admin/departments/class_departmentManagement.inc:279
+#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/ogroups/class_ogroupManagement.inc:360
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:282
+msgid "Home"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "Create new blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "New Blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/applications/class_applicationManagement.inc:329
+#: plugins/admin/departments/class_departmentManagement.inc:283
+#: plugins/admin/systems/class_systemManagement.inc:564
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+msgid "Current base"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+msgid "Submit department"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:361
+#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:291
+#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+msgid "edit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+msgid "Edit user"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/groups/class_groupManagement.inc:362
+#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
+msgid "delete"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+msgid "Delete user"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+msgid "Blocklist name"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/systems/class_systemManagement.inc:578
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:307
+msgid "Actions"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+msgid "This table displays faxblocklists for the selected tree."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+msgid "send"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+msgid "receive"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+msgid "Required field 'Name' is not set."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+msgid "Required field 'Name' contains invalid characters"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+msgid "Specified name is already used."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
+msgid "No permission to create a blocklist on this base."
+msgstr ""
+
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/remove.tpl:2 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
+#: plugins/gofon/conference/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 ""
 
@@ -2300,65 +2492,37 @@ msgstr ""
 msgid "List of blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:16
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/macro/headpage.tpl:16
-msgid "New"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/blocklists/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected blocklists. Having "
 "a large size of lists, you might prefer the range selectors on top of the "
 "select box."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you when performing "
-"changes on your blocklist. -Delete- will ask you for confirmation before "
-"really deleting anything."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:55
-msgid "Display lists of department"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:69
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:72
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:80
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:83
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2368,6 +2532,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr ""
 
@@ -2462,8 +2627,8 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1195
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr ""
 
@@ -2472,7 +2637,7 @@ msgid "FAX settings"
 msgstr ""
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:92
+#: plugins/addons/addressbook/address_edit.tpl:99
 #: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
@@ -2522,6 +2687,12 @@ msgstr ""
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+msgid ""
+"Deliver fax to printer, is only possible if valid printer is given. Please "
+"correct your choice."
+msgstr ""
+
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr ""
@@ -2535,6 +2706,7 @@ msgid "FAX ID"
 msgstr ""
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
 msgid "User"
 msgstr ""
 
@@ -2570,42 +2742,13 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
 msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:92
+#: plugins/addons/addressbook/contents.tpl:102
 #: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr ""
@@ -2653,67 +2796,45 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:4
-msgid "Choose the department to store entry in"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:16
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:23
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:47
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:57
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:65
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:71
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:77
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr ""
@@ -2725,10 +2846,6 @@ msgid ""
 "find 'Gonicus'. Use the filters below to narrow down your search."
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:42
-msgid "Actions"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:47
 msgid "Add entry"
 msgstr ""
@@ -2757,23 +2874,74 @@ msgstr ""
 msgid "Show addressbook entries"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:78
+#: plugins/addons/addressbook/contents.tpl:77
 msgid "Display results for department"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:95
-msgid "Search string"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:103
+#: plugins/addons/addressbook/contents.tpl:90
 msgid "Match object"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:93
 msgid "Choose the object that will be searched in"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
+#: plugins/addons/addressbook/contents.tpl:105
+msgid "Search string"
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+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 "
@@ -2819,51 +2987,51 @@ msgstr ""
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:466
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:468
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "organizations user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:473
 #, php-format
 msgid "Contact stored in %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:475
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/addons/addressbook/class_addressbook.inc:578
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/addons/addressbook/class_addressbook.inc:590
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -2902,20 +3070,20 @@ msgstr ""
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:299
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
-#: plugins/addons/ldapmanager/class_csvimport.inc:315
-#: plugins/addons/ldapmanager/class_import.inc:58
-#: plugins/addons/ldapmanager/class_import.inc:66
+#: plugins/addons/ldapmanager/class_csvimport.inc:302
+#: plugins/addons/ldapmanager/class_csvimport.inc:313
+#: plugins/addons/ldapmanager/class_csvimport.inc:318
+#: plugins/addons/ldapmanager/class_import.inc:59
+#: plugins/addons/ldapmanager/class_import.inc:67
 msgid "There is no file uploaded."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:304
-#: plugins/addons/ldapmanager/class_import.inc:51
+#: plugins/addons/ldapmanager/class_csvimport.inc:307
+#: plugins/addons/ldapmanager/class_import.inc:52
 msgid "The specified file is empty."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:442
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -2984,7 +3152,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 ""
 
@@ -3132,6 +3300,51 @@ msgstr ""
 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:155
+msgid "This 'dn' is no group."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr ""
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr ""
@@ -3156,64 +3369,93 @@ 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:25
+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/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr ""
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:204
+#: plugins/admin/groups/class_groupManagement.inc:273
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:210
-#: plugins/admin/groups/class_groupManagement.inc:236
+#: plugins/admin/groups/class_groupManagement.inc:279
+#: plugins/admin/groups/class_groupManagement.inc:305
 msgid "You are not allowed to delete this group!"
 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."
+#: plugins/admin/groups/class_groupManagement.inc:353
+msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Samba group"
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Domain admins"
+#: plugins/admin/groups/class_groupManagement.inc:361
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:291
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
-msgid "Domain users"
+#: plugins/admin/groups/class_groupManagement.inc:362
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
+msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:254
-msgid "Domain guests"
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:706
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:259
-#, php-format
-msgid "Special group (%d)"
+#: plugins/admin/groups/class_groupManagement.inc:375
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
+#: plugins/gofon/reports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
 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/class_groupManagement.inc:384
+msgid "Groupname"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:584
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/gofon/conference/generic.tpl:4
+msgid "Properties"
 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/class_groupManagement.inc:390
+#: plugins/admin/applications/class_applicationManagement.inc:359
+#: plugins/admin/ogroups/class_ogroupManagement.inc:395
+msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
 #: plugins/admin/groups/remove.tpl:7
@@ -3222,33 +3464,8 @@ msgid ""
 "do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:30
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing group "
-"properties. -Delete- will ask for confirmation before removing groups."
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Dive into LDAP subtrees when searching"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Search in subtrees"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:153
@@ -3287,6 +3504,15 @@ msgstr ""
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:650
+msgid "Please select a valid mail server."
+msgstr ""
+
 #: plugins/admin/groups/acl.tpl:4
 msgid "Object"
 msgstr ""
@@ -3315,18 +3541,18 @@ msgstr ""
 msgid "Select users to add"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:26
-#: plugins/admin/users/headpage.tpl:67
+#: plugins/admin/groups/group_objects.tpl:30
 msgid "Display users of department"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/users/headpage.tpl:71
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+#: plugins/gofon/conference/headpage.tpl:34
 msgid "Display users matching"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:31
-#: plugins/admin/users/headpage.tpl:72
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr ""
 
@@ -3386,10 +3612,6 @@ msgstr ""
 msgid "Folder administrators"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr ""
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -3422,6 +3644,11 @@ msgstr ""
 msgid "The selected application has no options."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:278
+#, php-format
+msgid "The application named %s is no longer available and has been removed."
+msgstr ""
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3429,39 +3656,6 @@ msgid ""
 "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 ""
@@ -3473,11 +3667,17 @@ msgid ""
 "of templates."
 msgstr ""
 
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:981
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr ""
+
 #: plugins/admin/users/template.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/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
@@ -3485,123 +3685,186 @@ msgstr ""
 msgid "Continue"
 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/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:17
-msgid "New template"
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
+msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:31
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+#: plugins/admin/users/class_userManagement.inc:350
+#, php-format
+msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:34
-msgid ""
-"-Edit- and -New...- execute an assistant to aid you in managing your account "
-"informations. -Delete- will ask for confirmation before deleting users."
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
+msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:48
-msgid "Select to see template pseudo users"
+#: plugins/admin/users/class_userManagement.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:201
+msgid "none"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:48
-msgid "Show templates"
+#: plugins/admin/users/class_userManagement.inc:541
+msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:49
-msgid "Select to see users that have only a GOsa object"
+#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:49
-msgid "Show functional users"
+#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:50
-msgid "Select to see users that have posix settings"
+#: plugins/admin/users/class_userManagement.inc:653
+msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:50
-msgid "Show unix users"
+#: plugins/admin/users/class_userManagement.inc:653
+msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:51
-msgid "Select to see users that have mail settings"
+#: plugins/admin/users/class_userManagement.inc:660
+msgid "password"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:51
-msgid "Show mail users"
+#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
+msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:52
-msgid "Select to see users that have samba settings"
+#: plugins/admin/users/class_userManagement.inc:673
+msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:52
-msgid "Show samba users"
+#: plugins/admin/users/class_userManagement.inc:704
+msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:53
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/users/class_userManagement.inc:705
+msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:53
-msgid "Show proxy users"
+#: plugins/admin/users/class_userManagement.inc:707
+msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/users/class_userManagement.inc:709
+msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
+#: plugins/admin/users/class_userManagement.inc:711
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
+#: plugins/admin/users/class_userManagement.inc:713
+msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
+#: plugins/admin/users/class_userManagement.inc:715
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
+#: plugins/admin/users/class_userManagement.inc:716
+msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
+#: plugins/admin/users/class_userManagement.inc:717
+msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
+#: plugins/admin/users/class_userManagement.inc:772
+msgid "Online"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
+#: plugins/admin/users/class_userManagement.inc:779
+msgid "Offline"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
+#: 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/headpage.tpl:6
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:24
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:354
 msgid "Application name"
 msgstr ""
 
@@ -3626,7 +3889,6 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:35
-#: plugins/gofon/macro/generic.tpl:22
 msgid "Choose subtree to place application in"
 msgstr ""
 
@@ -3658,6 +3920,41 @@ msgstr ""
 msgid "Place entry in members startmenu"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -3668,28 +3965,18 @@ msgstr ""
 msgid "List of applications"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:24
 msgid ""
 "This menu allows you to add, edit and remove selected applications. You may "
 "want to use the range selector on top of the application listbox, when "
 "working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing applications."
-msgstr ""
-
-#: plugins/admin/applications/headpage.tpl:46
-msgid "Display applications of department"
-msgstr ""
-
-#: plugins/admin/applications/headpage.tpl:58
+#: plugins/admin/applications/headpage.tpl:38
 msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:61
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr ""
 
@@ -3698,45 +3985,47 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:59
-msgid "This 'dn' is no application."
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:148
-msgid "The specified picture has not been uploaded correctly."
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:229
-msgid "You have no permissions to create a application on this 'Base'."
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:234
-msgid "Required field 'Name' is not filled."
+#: plugins/admin/applications/class_applicationManagement.inc:327
+msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:237
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:246
-msgid "There's already an application with this 'Name'."
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:185
-#, php-format
-msgid "You're about to delete the application '%s'."
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:191
-#: plugins/admin/applications/class_applicationManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
-msgid "You are not allowed to delete this application!"
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-msgid "Properties"
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
@@ -3748,6 +4037,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
+#: plugins/gofon/conference/generic.tpl:57
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -3760,6 +4050,8 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
+#: plugins/gofon/conference/generic.tpl:24
+#: plugins/gofon/conference/generic.tpl:122
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -3784,6 +4076,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:7
+#: plugins/gofon/conference/remove.tpl:7
 msgid ""
 "This includes <b>all</b> accounts, systems, etc. in this subtree. Please "
 "double check if your really want to do this since there is no way for GOsa "
@@ -3791,6 +4084,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:11 plugins/admin/systems/remove.tpl:11
+#: plugins/gofon/conference/remove.tpl:11
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
@@ -3801,29 +4095,18 @@ msgstr ""
 msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
 "a large size of departments, you might prefer the range selectors on top of "
 "the department list."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will provide an assistant to aid you when performing "
-"changes on your departments. -Delete- will ask for confirmation before "
-"deleting departments."
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Display subdepartments of"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:56
+#: plugins/admin/departments/headpage.tpl:38
 msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:59
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr ""
 
@@ -3831,39 +4114,66 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:129
-msgid "You have no permissions to create a department on this 'Base'."
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:43
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:136
-#: plugins/admin/departments/class_departmentGeneric.inc:138
-msgid "Department with that 'Name' already exists."
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:175
+#, php-format
+msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:146
-msgid "Required field 'Description' is not set."
+#: plugins/admin/departments/class_departmentManagement.inc:202
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:192
+msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:151
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentManagement.inc:279
+msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:152
-msgid " Please choose another name."
+#: plugins/admin/departments/class_departmentManagement.inc:281
+msgid "Create new department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-msgid "Departments"
+#: plugins/admin/departments/class_departmentManagement.inc:289
+msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:130
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+#: plugins/admin/departments/class_departmentManagement.inc:297
+msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:145
-msgid "You have no permission to remove this department."
+#: plugins/admin/departments/class_departmentManagement.inc:316
+msgid "department"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:393
+msgid ".."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -3914,28 +4224,32 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
+#: plugins/admin/systems/class_servService.inc:240
+msgid "Terminal server, must have fontpath specified."
+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_winGeneric.inc:139
 #: 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_winGeneric.inc:153
 #: 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_winGeneric.inc:163
 #: 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
+#: plugins/admin/systems/class_phoneGeneric.inc:299
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -4036,6 +4350,42 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr ""
@@ -4074,44 +4424,27 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:179
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: 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/servservice.tpl:80
-msgid "Font path"
+#: 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/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:6
@@ -4136,6 +4469,74 @@ msgstr ""
 msgid "Select action to execute for this server"
 msgstr ""
 
+#: plugins/admin/systems/phone.tpl:6
+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
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4212,10 +4613,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
@@ -4228,70 +4625,6 @@ msgstr ""
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr ""
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr ""
@@ -4312,6 +4645,18 @@ 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 ""
@@ -4328,95 +4673,180 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:246
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:262
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:275
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:319
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:378
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:644
-msgid "New terminal"
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
+msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:647
-msgid "New workstation"
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
+msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:663
-msgid "Thin client template for"
+#: plugins/admin/systems/class_systemManagement.inc:559
+msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:675
-msgid "Workstation template for"
+#: plugins/admin/systems/class_systemManagement.inc:560
+msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
+#: plugins/admin/systems/class_systemManagement.inc:561
+msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/class_systemManagement.inc:562
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/class_systemManagement.inc:570
+msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid "Remove DNS service"
+#: plugins/admin/systems/class_systemManagement.inc:571
+msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/class_systemManagement.inc:577
+msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid "Add DNS service"
+#: plugins/admin/systems/class_systemManagement.inc:581
+msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/class_systemManagement.inc:614
+msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/class_systemManagement.inc:615
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_systemManagement.inc:616
+msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_systemManagement.inc:617
+msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/class_systemManagement.inc:618
+msgid "Imap Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:619
+msgid "Nfs Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:620
+msgid "Kerberos Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:621
+msgid "Asterisk Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:622
+msgid "Fax Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:623
+msgid "Ldap Server"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:649
+msgid "Set root password"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:700
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:701
+#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:706
+msgid "Winstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:707
+msgid "Network Device"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:917
+msgid "New terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:920
+msgid "New workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:937
+msgid "Terminal template for"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:948
+msgid "Workstation template for"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:34
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:37
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
 #: plugins/admin/systems/workstation.tpl:9
@@ -4487,61 +4917,61 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:119
+#: plugins/admin/systems/class_servKolab.inc:143
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:125
+#: plugins/admin/systems/class_servKolab.inc:149
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:197
+#: plugins/admin/systems/class_servKolab.inc:221
 msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
+#: 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:203
+#: plugins/admin/systems/class_servKolab.inc:227
 msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:205
+#: 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:207
+#: plugins/admin/systems/class_servKolab.inc:231
 msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:211
+#: plugins/admin/systems/class_servKolab.inc:235
 msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:215
+#: plugins/admin/systems/class_servKolab.inc:239
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
@@ -4597,34 +5027,30 @@ msgstr ""
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
+#: 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:142
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:147
+#: plugins/admin/systems/servkolab.tpl:149
 msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:167
+#: plugins/admin/systems/servkolab.tpl:169
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr ""
@@ -4640,101 +5066,85 @@ msgstr ""
 msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:24
 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/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/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:74
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:82
-msgid "Display terminal(s) of user"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:85
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:269
-msgid "The required field 'MAC-address' is not set."
-msgstr ""
-
-#: 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/service.tpl:4
 msgid "Keyboard"
 msgstr ""
@@ -4780,13 +5190,13 @@ msgid "Choose mouse port"
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:22
+#: plugins/gofon/phoneaccount/generic.tpl:24
 msgid "Telephone hardware"
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
 msgid "Telephone"
 msgstr ""
 
@@ -4910,6 +5320,16 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
+msgstr ""
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr ""
@@ -5034,39 +5454,48 @@ msgstr ""
 msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:104
+#: plugins/admin/systems/class_phoneGeneric.inc:102
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/admin/systems/class_phoneGeneric.inc:174
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:197
+#: plugins/admin/systems/class_phoneGeneric.inc:195
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:197
+#: plugins/admin/systems/class_phoneGeneric.inc:195
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:263
+#: plugins/admin/systems/class_phoneGeneric.inc:213
+#, php-format
+msgid ""
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:270
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:266
+#: plugins/admin/systems/class_phoneGeneric.inc:273
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:275
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
+#: plugins/admin/systems/class_phoneGeneric.inc:289
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
@@ -5089,7 +5518,6 @@ msgid "Choose a phone type"
 msgstr ""
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:64
 msgid "refresh"
 msgstr ""
 
@@ -5143,14 +5571,46 @@ msgstr ""
 msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:212
+#: plugins/admin/systems/phonesettings.tpl:210
 msgid "MSN"
 msgstr ""
 
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
+msgstr ""
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
@@ -5230,8 +5690,68 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:209
+msgid "servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:220
+msgid "and"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:371
+msgid "Non existing dn: "
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:502
+msgid "Object groups need at least one member!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:507
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 msgid "Object groups"
 msgstr ""
 
@@ -5251,258 +5771,460 @@ msgstr ""
 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
 #, 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
 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."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "too many different objects!"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr ""
+
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:24
+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:39
+msgid "Show groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
+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/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 ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:79
+msgid "ring all"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:80
+msgid "round robin"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:81
+msgid "least recently called"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:82
+msgid "fewest completed calls"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+msgid "random"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "round robin with memory"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:110
+msgid "Remove the phone queue from this Account"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:111
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid "Create phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:160
+msgid "Uruguai"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:198
+msgid "Timeout must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:201
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:204
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:207
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:210
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:233
+#: plugins/admin/ogroups/class_phonequeue.inc:596
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:71
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:243
+#: plugins/admin/ogroups/class_phonequeue.inc:606
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:78
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:262
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:274
+#: plugins/admin/ogroups/class_phonequeue.inc:478
+#: plugins/admin/ogroups/class_phonequeue.inc:642
+#, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:507
+#: plugins/admin/ogroups/class_phonequeue.inc:509
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1008
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "users"
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "groups"
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "applications"
+#: plugins/admin/ogroups/phonequeue.tpl:46
+msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "departments"
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "servers"
+#: plugins/admin/ogroups/phonequeue.tpl:62
+msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:74
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "terminals"
+#: plugins/admin/ogroups/phonequeue.tpl:82
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
-msgid "phones"
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:215
-msgid "printers"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:222
-msgid "and"
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:369
-msgid "Non existing dn: "
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:500
-msgid "Object groups need at least one member!"
+#: plugins/admin/ogroups/phonequeue.tpl:116
+msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:505
-msgid "You can combine two different object types at maximum only!"
+#: plugins/admin/ogroups/phonequeue.tpl:124
+msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
 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/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
 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/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show groups containing users"
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:49
-msgid "Show groups containing groups"
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:50
-msgid "Show groups containing applications"
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Show groups containing departments"
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Show groups containing servers"
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:53
-msgid "Show groups containing workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:54
-msgid "Show groups containing terminals"
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:55
-msgid "Show groups containing printers"
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
 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."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:482
+msgid "Error while performing query "
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:496
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:616
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:518
+msgid ""
+"The macro you selected, is no longer available for you, please choose "
+"another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:626
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:630
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:631
+msgid ""
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:634
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:647
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:673
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:767
 #, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
-#, php-format
-msgid "The given PIN is too short"
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 #, 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:481
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:319
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:781
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:940
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:38
-msgid "Forward calls to"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:975
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-#: plugins/gofon/phoneaccount/generic.tpl:42
-msgid "Phone number"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-msgid "Timeout (s)"
+#: plugins/gofon/phoneaccount/generic.tpl:37
+msgid "Set voicemail password"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:57
-#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:52
+#: plugins/gofon/phoneaccount/generic.tpl:53
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:75
-msgid "Phone PIN"
+#: plugins/gofon/phoneaccount/generic.tpl:60
+msgid "Refresh"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Complete"
 msgstr ""
 
 #: plugins/gofon/reports/class_fonreport.inc:6
@@ -5533,11 +6255,6 @@ msgstr ""
 msgid "Channel"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
 #: plugins/gofon/reports/contents.tpl:36
 msgid "Duration"
 msgstr ""
@@ -5546,29 +6263,64 @@ msgstr ""
 msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:80
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
 msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:161
+#: plugins/gofon/macro/class_gofonMacro.inc:147
+msgid ""
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:250
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
+#, php-format
+msgid "Can't perform DELETE query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:323
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:166
+#: plugins/gofon/macro/class_gofonMacro.inc:328
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:171
+#: plugins/gofon/macro/class_gofonMacro.inc:332
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:337
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:180
+#: plugins/gofon/macro/class_gofonMacro.inc:343
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+msgid "Please choose a valid  base."
+msgstr ""
+
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 msgid "Macro name"
 msgstr ""
@@ -5577,6 +6329,10 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr ""
 
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr ""
+
 #: plugins/gofon/macro/generic.tpl:43
 msgid "Visible for user"
 msgstr ""
@@ -5585,63 +6341,102 @@ msgstr ""
 msgid "Macro text"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:229
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:24
+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/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr ""
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 msgid "String"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:237
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:311
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:29
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:32
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing macros."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:46
-msgid "Display macros of department"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:59
-msgid "Display macros  matching"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:62
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
 msgstr ""
 
 #: plugins/gofon/macro/parameter.tpl:3
@@ -5652,33 +6447,126 @@ msgstr ""
 msgid "type"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/conference/generic.tpl:13
+msgid "Conference name"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/conference/generic.tpl:18
+msgid "Name of conference to create"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:192
-msgid "You are not allowed to delete this macro!"
+#: plugins/gofon/conference/generic.tpl:35
+msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
+#: plugins/gofon/conference/generic.tpl:62
+msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:46
-msgid "Thin Client"
+#: plugins/gofon/conference/generic.tpl:70
+msgid "Phone number"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/gofon/conference/generic.tpl:99
+msgid "Preset PIN"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "PIN"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:113
+msgid "Record conference"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:121
+msgid "Sound file format"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:138
+msgid "Play music on hold"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:144
+msgid "Activate session menu"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:150
+msgid "Announce users joining or leaving the conference"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+msgid "This table displays all available conference rooms."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
+msgid "Name / nummer"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+msgid "Owner"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:360
+msgid "Conference"
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Regular expression for        matching user names"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid "Please enter a PIN."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+msgid "Please enter a name for the conference."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+msgid "Only numeric chars are allowed in Number field."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numbers are allowed in Lifetime."
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+msgid "Conference management"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:46
+msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl:11
@@ -5719,7 +6607,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr ""
 
@@ -5759,97 +6647,97 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:272
+#: include/functions.inc:282
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:293
+#: include/functions.inc:303
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:313
+#: include/functions.inc:322
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:351
+#: include/functions.inc:360
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:361
+#: include/functions.inc:370
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:376
+#: include/functions.inc:385
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:402
+#: include/functions.inc:411
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:432
+#: include/functions.inc:441
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:442
+#: include/functions.inc:451
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:450
+#: include/functions.inc:459
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:522
+#: include/functions.inc:573
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:524
+#: include/functions.inc:575
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:536
+#: include/functions.inc:587
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:541
+#: include/functions.inc:592
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:924
+#: include/functions.inc:991
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1023
+#: include/functions.inc:1090
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1469
+#: include/functions.inc:1544
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1512
+#: include/functions.inc:1587
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -5909,36 +6797,6 @@ msgstr ""
 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:386
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:412 include/class_password-methods.inc:178
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:438
-#, 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_pluglist.inc:98
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
@@ -5953,14 +6811,30 @@ msgid ""
 "changes?"
 msgstr ""
 
-#: include/class_password-methods.inc:162
+#: 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 "Setting the password failed. LDAP server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_password-methods.inc:199
+#: include/class_plugin.inc:454
+#, php-format
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
 #: include/class_config.inc:69
@@ -5972,12 +6846,22 @@ msgstr ""
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:426
+#: include/class_config.inc:433
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
 #: include/class_password-methods-kerberos.inc:43
@@ -5994,26 +6878,30 @@ msgstr ""
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/class_ldap.inc:398
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_ldap.inc:438
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:631
+#: include/class_ldap.inc:671
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:644
+#: include/class_ldap.inc:684
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:660
+#: include/class_ldap.inc:700
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -6042,6 +6930,16 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -6126,302 +7024,302 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:233
+#: include/functions_setup.inc:236
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:243
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:258
+#: include/functions_setup.inc:261
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:264
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:266
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:280
+#: include/functions_setup.inc:283
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:284
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:282
+#: include/functions_setup.inc:285
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:288
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:289
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:292
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:290
+#: include/functions_setup.inc:293
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:296
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:297
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:300
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:301
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:303
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:304
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:307
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:308
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:311
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:312
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:315
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:316
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:319
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:320
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:323
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:324
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:327
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:328
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:331
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:332
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:342
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:347
+#: include/functions_setup.inc:351
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:352
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:355
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:356
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:359
+#: include/functions_setup.inc:363
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:364
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:375
+#: include/functions_setup.inc:379
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:376
+#: include/functions_setup.inc:380
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:393
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:394
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:397
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:398
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:401
+#: include/functions_setup.inc:405
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:402
+#: include/functions_setup.inc:406
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:413
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:410
+#: include/functions_setup.inc:414
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:418
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:419
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:423
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:424
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:659
+#: include/functions_setup.inc:666
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:668 include/functions_setup.inc:750
+#: include/functions_setup.inc:675 include/functions_setup.inc:758
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:682 include/functions_setup.inc:755
-#: include/functions_setup.inc:760
+#: include/functions_setup.inc:689 include/functions_setup.inc:763
+#: include/functions_setup.inc:768
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:770
+#: include/functions_setup.inc:778
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:826
+#: include/functions_setup.inc:834
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:857
+#: include/functions_setup.inc:865
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:866
+#: include/functions_setup.inc:874
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:976 include/functions_setup.inc:999
-#: include/functions_setup.inc:1008 html/index.php:176
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -6429,14 +7327,22 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "next"
+msgstr ""
+
+#: html/helpviewer.php:141
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
 #: html/getfax.php:53
@@ -6462,22 +7368,22 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: html/main.php:96
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:139
+#: html/main.php:155
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:263
+#: html/main.php:284
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:292
+#: html/main.php:313
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
@@ -6523,22 +7429,27 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
 
-#: html/helpviewer.php:85
-msgid "previous"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: html/helpviewer.php:89
-msgid "next"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: html/helpviewer.php:141
-#, php-format
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -6563,33 +7474,10 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-
 #: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
 #: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
 msgid "Directory"
@@ -6603,27 +7491,20 @@ msgstr ""
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:15
@@ -6646,17 +7527,6 @@ 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
@@ -6673,6 +7543,31 @@ msgid ""
 "correct minimum version."
 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_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/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6784,7 +7679,29 @@ msgstr ""
 msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:100
+#: ihtml/themes/altlinux/setup_step4.tpl:99
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it  could be a security risk)  "
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+msgid "Display PHP errors"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+msgid "true"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+msgid "false"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
@@ -6832,23 +7749,12 @@ msgid ""
 "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/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
 #: ihtml/themes/default/setup_step4.tpl:100
@@ -6857,23 +7763,3 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting. "
 "(But it could be a security risk)  "
 msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:104
-msgid "Display PHP errors"
-msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:107
-msgid "true"
-msgstr ""
-
-#: ihtml/themes/default/setup_step4.tpl:108
-msgid "false"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""