Added missing files

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 2746fe04df3d2f4624f548dc39effa533fa07236..a57fa2a6626ced7db8e760d3c9d7aa7cfa69b8ec 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,51 +24,51 @@ 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/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:710
 #: 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/admin/users/class_userManagement.inc:716
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:63 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 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/users/class_userManagement.inc:714
 #: 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/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
+#: plugins/addons/addressbook/contents.tpl:14
 #: 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/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -79,241 +79,104 @@ msgstr ""
 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 plugins/admin/ogroups/phonequeue.tpl:31
+#: 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:517
+#: 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:151 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:152 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:154 plugins/personal/mail/generic.tpl:112
+#: plugins/personal/environment/logonManagement.tpl:53
+#: plugins/personal/environment/logonManagement.tpl:57
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:153
+#: contrib/gosa.conf:155
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:171
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:160
+#: contrib/gosa.conf:188 plugins/admin/ogroups/class_phonequeue.inc:160
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:189
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:190
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:191
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:192
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:193
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:192
+#: 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"
@@ -355,14 +218,17 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/environment/environment.tpl:114
+#: plugins/personal/environment/environment.tpl:169
+#: plugins/personal/environment/kioskManagement.tpl:13
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -373,10 +239,10 @@ msgstr ""
 #: 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
-#: plugins/admin/systems/startup.tpl:95
 #: plugins/admin/systems/phonesettings.tpl:181
 #: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -386,9 +252,12 @@ msgstr ""
 
 #: 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/personal/environment/environment.tpl:115
+#: plugins/personal/environment/environment.tpl:155
+#: plugins/personal/environment/environment.tpl:170
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
 #: plugins/gofax/faxaccount/generic.tpl:77
@@ -400,13 +269,13 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/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/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
+#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:15
 msgid "Delete"
 msgstr ""
@@ -454,7 +323,8 @@ msgstr ""
 
 #: 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
+#: plugins/personal/environment/environment.tpl:57
 msgid "MB"
 msgstr ""
 
@@ -491,71 +361,219 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/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"
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+msgid "This does something"
 msgstr ""
 
-#: plugins/personal/mail/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/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: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/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/personal/environment/main.inc:104
+#: 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/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:261
+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/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialog.tpl:76
+#: plugins/personal/environment/logonManagement.tpl:78
+#: plugins/personal/environment/hotplugDialogNew.tpl:30
+#: plugins/personal/environment/selectPrinterDialog.tpl:75
+#: 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/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
+#: plugins/admin/users/template.tpl:46 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/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/conference/remove.tpl:17
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:263
+#: 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/personal/environment/main.inc:114
 #: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:111
 msgid "Click the 'Edit' button below to change informations in this dialog"
@@ -564,9 +582,12 @@ 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/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:116
 #: 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 ""
@@ -583,6 +604,8 @@ msgstr ""
 #: plugins/personal/mail/mail_locals.tpl:20
 #: plugins/personal/posix/posix_groups.tpl:20
 #: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:34
+#: plugins/personal/environment/selectPrinterDialog.tpl:35
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
@@ -604,9 +627,10 @@ msgid "Display addresses of department"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:44
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
 #: plugins/admin/groups/group_objects.tpl:34
@@ -641,11 +665,11 @@ msgstr ""
 #: 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
+#: plugins/admin/systems/servdb.tpl:109
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 msgid "Password"
 msgstr ""
 
@@ -706,8 +730,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: 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_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -757,19 +781,6 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr ""
-
-#: 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 ""
@@ -852,11 +863,24 @@ 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
+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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -900,24 +924,12 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:123
+#: plugins/personal/posix/generic.tpl:91
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
@@ -926,7 +938,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Group of user"
 msgstr ""
 
@@ -936,7 +948,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:184
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:207
 msgid "automatic"
 msgstr ""
 
@@ -944,54 +956,54 @@ msgstr ""
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:239
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:241
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
-"remove the samba account first."
+"remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:243
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:431
+#: plugins/personal/posix/class_posixAccount.inc:432
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:434
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:436
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1002,7 +1014,7 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1013,7 +1025,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1024,7 +1036,7 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1035,7 +1047,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1046,7 +1058,7 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1057,7 +1069,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1068,7 +1080,7 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1079,7 +1091,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1090,7 +1102,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1101,7 +1113,7 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1112,7 +1124,7 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1123,7 +1135,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 #: plugins/personal/samba/class_sambaAccount.inc:450
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
@@ -1132,85 +1144,89 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:543
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:710
+#: plugins/personal/posix/class_posixAccount.inc:711
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:862
+#: plugins/personal/posix/class_posixAccount.inc:866
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:865
+#: plugins/personal/posix/class_posixAccount.inc:869
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:873
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:876
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:884
 #: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/personal/posix/class_posixAccount.inc:887
 #: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:895
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:896
+#: plugins/personal/posix/class_posixAccount.inc:900
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:905
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:911
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:914
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1031
 #: 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 ""
@@ -1337,10 +1353,6 @@ 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 ""
@@ -1353,6 +1365,10 @@ 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 ""
@@ -1445,169 +1461,45 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
+#: 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/class_user.inc:233
-msgid "male"
+#: plugins/personal/generic/generic_picture.tpl:6
+#: plugins/personal/generic/generic.tpl:15
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc: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!"
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
 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/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+#: plugins/admin/systems/servnfs.tpl:85
+msgid "Save"
 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/personal/environment/logonManagement.tpl:10
+#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
+#: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
 
@@ -1743,8 +1635,8 @@ msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:51
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr ""
@@ -1821,15 +1713,6 @@ msgstr ""
 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
-msgid "Save"
-msgstr ""
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1838,6 +1721,7 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
@@ -1856,118 +1740,173 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: 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/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/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/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
+#: 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/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: 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/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
+#: 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/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
+#: 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/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
+#: 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/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
+#: 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/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+#: 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/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr ""
+
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
@@ -2022,41 +1961,6 @@ msgstr ""
 msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: 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:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr ""
-
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr ""
@@ -2079,6 +1983,7 @@ msgid "Download bandwidth"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:53
 msgid "Quota"
 msgstr ""
 
@@ -2138,48 +2043,40 @@ 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 ""
-
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 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 ""
 
@@ -2187,451 +2084,897 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+msgid ""
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
-msgid "Type"
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
+msgid ""
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: 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"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, php-format
-msgid "You're about to delete the blocklist '%s'."
+msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
-msgid "You have no permission to remove this blocklist."
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
-msgid "Please specify a valid phone number."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 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"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 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"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 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"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 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"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 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"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 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"
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-msgid "Create new blocklist"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-msgid "New Blocklist"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/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"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
 msgstr ""
 
-#: plugins/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"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
 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"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
 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"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
 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"
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
 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"
+#: plugins/personal/environment/class_environment.inc:12
+#: plugins/admin/users/class_userManagement.inc:708
+msgid "Environment"
 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"
+#: plugins/personal/environment/class_environment.inc:184
+msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-msgid "Blocklist name"
+#: plugins/personal/environment/class_environment.inc:185
+msgid ""
+"This server has environment extension enabled. You can disable it by "
+"clicking below."
 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"
+#: plugins/personal/environment/class_environment.inc:189
+#: plugins/personal/environment/class_environment.inc:194
+msgid "Add environment extension"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
-msgid "This table displays faxblocklists for the selected tree."
+#: plugins/personal/environment/class_environment.inc:190
+msgid ""
+"This server has environment extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
-msgid "send"
+#: plugins/personal/environment/class_environment.inc:195
+msgid ""
+"This server has environment extension disabled. You have to setup a posix "
+"account before you can enable this feature."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
-msgid "receive"
+#: plugins/personal/environment/class_environment.inc:569
+msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
-msgid "You have no permissions to create a blocklist on this 'Base'."
+#: plugins/personal/environment/class_environment.inc:573
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-#: plugins/admin/departments/class_departmentGeneric.inc:147
-msgid "Required field 'Name' is not set."
+#: plugins/personal/environment/class_environment.inc:908
+msgid "Admin"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
-msgid "Required field 'Name' contains invalid characters"
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
-msgid "Specified name is already used."
+#: plugins/personal/environment/class_hotplugDialog.inc:109
+msgid "Please specify a valid name."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
-msgid "No permission to create a blocklist on this base."
+#: plugins/personal/environment/class_hotplugDialog.inc:112
+msgid "Please specify a valid description."
 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
-#: 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"
+#: plugins/personal/environment/class_hotplugDialog.inc:115
+msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:7
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/personal/environment/class_hotplugDialog.inc:119
+msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:11
-#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
-#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
-msgid ""
-"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
-"abort."
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+msgid "Please select a printer or press cancel."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:1
+msgid "Select hotplug entry"
 msgstr ""
 
-#: 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."
+#: plugins/personal/environment/hotplugDialog.tpl:5
+msgid "Hotplug management"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: 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 ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:28
+msgid "This menu allows you to select an existing hotplug configuration."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:40
+msgid "Display hotplugs of department"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:43
+msgid "Choose the department the search will be based    on"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
+#: plugins/personal/environment/hotplugDialog.tpl:57
+#: 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/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
+#: plugins/personal/environment/hotplugDialog.tpl:62
+msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
-msgid "Blocklist management"
+#: plugins/personal/environment/hotplugDialog.tpl:75
+#: plugins/personal/environment/logonManagement.tpl:77
+#: plugins/personal/environment/selectPrinterDialog.tpl:74
+msgid "Use"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:12
-msgid "Fax number for GOfax to trigger on"
+#: plugins/personal/environment/class_logonManagementDialog.inc:92
+msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35
-msgid "Language"
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified decription contains invalid characters."
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:18
-msgid "Specify the GOfax communication language for fax to mail gateway"
+#: plugins/personal/environment/logonManagement.tpl:1
+msgid "Logon management"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:24
-msgid "Delivery format"
+#: plugins/personal/environment/logonManagement.tpl:5
+#: plugins/personal/environment/environment.tpl:105
+msgid "Logon script management"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:26
-msgid "Specify delivery format for fax to mail gateway"
+#: plugins/personal/environment/logonManagement.tpl:8
+msgid "Logon script settings"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:38
-msgid "Delivery methods"
+#: plugins/personal/environment/logonManagement.tpl:17
+#: plugins/personal/environment/hotplugDialogNew.tpl:14
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/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 ""
 
-#: plugins/gofax/faxaccount/generic.tpl:41
-msgid "Temporary disable fax usage"
+#: plugins/personal/environment/logonManagement.tpl:24
+msgid "Priority"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:45
-msgid "Deliver fax as mail to"
+#: plugins/personal/environment/logonManagement.tpl:35
+msgid "Logon script flags"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:49
-msgid "Deliver fax as mail"
+#: plugins/personal/environment/logonManagement.tpl:40
+msgid "Last proceeded script"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:54
-msgid "Deliver fax to printer"
+#: plugins/personal/environment/logonManagement.tpl:48
+msgid "Overloadable"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:69
-msgid "Alternate fax numbers"
+#: plugins/personal/environment/logonManagement.tpl:65
+msgid "Logon script"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:85
-msgid "Blocklists"
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+#: plugins/personal/environment/hotplugDialogNew.tpl:5
+msgid "Create new hotplug entry"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:88
-msgid "Blocklists for incoming fax"
+#: plugins/personal/environment/hotplugDialogNew.tpl:21
+msgid "ID"
 msgstr ""
 
-#: plugins/gofax/faxaccount/generic.tpl:94
-msgid "Blocklists for outgoing fax"
+#: plugins/personal/environment/hotplugDialogNew.tpl:29
+msgid "save"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:6
-msgid "Select numbers to add"
+#: plugins/personal/environment/environment.tpl:3
+msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:28
-msgid "Display numbers of department"
+#: plugins/personal/environment/environment.tpl:6
+msgid "Environment managment settings"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:40
-msgid "Display numbers matching"
+#: plugins/personal/environment/environment.tpl:9
+msgid "Profiles"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:43
-msgid "Regular expression for matching numbers"
+#: plugins/personal/environment/environment.tpl:10
+msgid "Profile managment"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:49
-msgid "Display numbers of user"
+#: plugins/personal/environment/environment.tpl:17
+msgid "Use profile managment"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:52
-msgid "User name of which numbers are shown"
+#: plugins/personal/environment/environment.tpl:24
+msgid "Profile server managment"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:4
-msgid "Blocked numbers/lists"
+#: plugins/personal/environment/environment.tpl:27
+msgid "Profil server"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:19
-#: plugins/admin/groups/mail_admins.tpl:24
-msgid "Select a specific department"
+#: plugins/personal/environment/environment.tpl:39
+msgid "Use local caching"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
-#: plugins/admin/groups/mail_admins.tpl:30
-msgid "Choose"
+#: plugins/personal/environment/environment.tpl:62
+#: plugins/admin/systems/service.tpl:94
+msgid "Resolution"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:27
-msgid "List of predefined blocklists"
+#: plugins/personal/environment/environment.tpl:76
+msgid "Resolution changeable on runtime"
 msgstr ""
 
-#: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/environment.tpl:86
+msgid "Kiosk profile"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:83
+msgid "Kiosk profile settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:99
+msgid "Profile management"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:104
+msgid "Logon scripts"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:122
+msgid "Attach share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:142
+msgid "Hotplug devices"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:143
+msgid "Hotplug device settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:153
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:154
+msgid "Existing"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:160
+#: 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/personal/environment/environment.tpl:161
+msgid "Printer settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:171
+msgid "Admin Toggle"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
+msgid "Select printer entry"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:5
+#: plugins/personal/environment/selectPrinterDialog.tpl:10
+msgid "Select printer to add"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:28
+msgid ""
+"This menu allows you to create, edit and delete selected printers. \n"
+"\t\t\t\t\t\t\tHaving a great number of printers, you may want to use the "
+"range selectors on top of the printers list."
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:41
+msgid "Display printers of department"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:58
+msgid "Display printers matching"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:63
+msgid "Regular expression for matching printer names"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:80
+#, php-format
+msgid "Can't open '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
+msgid "Kiosk profile management"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:12
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+msgid "Browse"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:22
+msgid "Close"
+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/generic.tpl:8
+msgid "List name"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
+msgid "Type"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: 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 ""
+
+#: plugins/gofax/blocklists/remove.tpl:7
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:11
+#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
+#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
+#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
+msgid ""
+"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
+"abort."
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl: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:38
+msgid "Select to see send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr ""
+
+#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
+msgid "Blocklist management"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:12
+msgid "Fax number for GOfax to trigger on"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:16
+#: plugins/admin/ogroups/phonequeue.tpl:35
+msgid "Language"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:18
+msgid "Specify the GOfax communication language for fax to mail gateway"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:24
+msgid "Delivery format"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:26
+msgid "Specify delivery format for fax to mail gateway"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:38
+msgid "Delivery methods"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:41
+msgid "Temporary disable fax usage"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:45
+msgid "Deliver fax as mail to"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:49
+msgid "Deliver fax as mail"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:54
+msgid "Deliver fax to printer"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:69
+msgid "Alternate fax numbers"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:85
+msgid "Blocklists"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:88
+msgid "Blocklists for incoming fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/generic.tpl:94
+msgid "Blocklists for outgoing fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:6
+msgid "Select numbers to add"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:28
+msgid "Display numbers of department"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:40
+msgid "Display numbers matching"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:43
+msgid "Regular expression for matching numbers"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:49
+msgid "Display numbers of user"
+msgstr ""
+
+#: plugins/gofax/faxaccount/locals.tpl:52
+msgid "User name of which numbers are shown"
+msgstr ""
+
+#: plugins/gofax/faxaccount/lists.tpl:4
+msgid "Blocked numbers/lists"
+msgstr ""
+
+#: plugins/gofax/faxaccount/lists.tpl:19
+#: plugins/admin/groups/mail_admins.tpl:24
+msgid "Select a specific department"
+msgstr ""
+
+#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
+#: plugins/admin/groups/mail_admins.tpl:30
+msgid "Choose"
+msgstr ""
+
+#: plugins/gofax/faxaccount/lists.tpl:27
+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:1270
 msgid "Apply"
 msgstr ""
 
@@ -2737,12 +3080,41 @@ msgstr ""
 msgid "Status message"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+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/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
+#: 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
@@ -2799,45 +3171,67 @@ msgstr ""
 msgid "Search returned no results..."
 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!"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
+#: 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/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
 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"
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 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/contents.tpl:15
 msgid "Contact"
 msgstr ""
@@ -2893,57 +3287,6 @@ msgstr ""
 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 "
@@ -3102,11 +3445,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr ""
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
@@ -3303,51 +3641,6 @@ 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 ""
@@ -3372,21 +3665,6 @@ 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"
@@ -3406,11 +3684,6 @@ msgstr ""
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "New"
-msgstr ""
-
 #: plugins/admin/groups/class_groupManagement.inc:361
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
@@ -3461,14 +3734,70 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: 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/remove.tpl:7
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:153
@@ -3548,12 +3877,6 @@ msgstr ""
 msgid "Display users of department"
 msgstr ""
 
-#: 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:41
 #: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
@@ -3615,6 +3938,10 @@ 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 ""
@@ -3659,39 +3986,6 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr ""
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-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_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
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr ""
-
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr ""
-
 #: plugins/admin/users/class_userManagement.inc:25
 msgid "Users"
 msgstr ""
@@ -3721,12 +4015,10 @@ msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:652
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
 msgid "Create new user"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:652
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
 msgid "New user"
 msgstr ""
 
@@ -3744,10 +4036,10 @@ msgstr ""
 
 #: 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/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr ""
 
@@ -3768,37 +4060,70 @@ msgid "Edit UNIX properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:709
-msgid "Edit mail properties"
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:711
-msgid "Edit phone properties"
+msgid "Edit mail properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:713
-msgid "Edit fax properies"
+msgid "Edit phone properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:715
+msgid "Edit fax properies"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:718
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:719
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:781
 msgid "Offline"
 msgstr ""
 
+#: plugins/admin/users/class_userManagement.inc:989
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr ""
+
 #: plugins/admin/users/remove.tpl:7
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -3865,6 +4190,45 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+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/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -3923,41 +4287,6 @@ 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 "
@@ -3988,25 +4317,6 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr ""
-
-#: 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_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "new"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-msgid "Create new application"
-msgstr ""
-
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr ""
@@ -4031,6 +4341,25 @@ msgstr ""
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: 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_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "new"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+msgid "Create new application"
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -4053,7 +4382,6 @@ 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 ""
@@ -4117,6 +4445,27 @@ msgstr ""
 msgid "Department management"
 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/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4142,41 +4491,20 @@ msgstr ""
 msgid "Create new department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:289
-msgid "This table displays all departments, in the selected tree."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:297
-msgid "Department name"
-msgstr ""
-
-#: 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."
+#: plugins/admin/departments/class_departmentManagement.inc:289
+msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
+#: plugins/admin/departments/class_departmentManagement.inc:297
+msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentManagement.inc:316
+msgid "department"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
+#: plugins/admin/departments/class_departmentManagement.inc:393
+msgid ".."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -4227,10 +4555,6 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
-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."
@@ -4247,7 +4571,7 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_terminalGeneric.inc:254
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/systems/class_workstationGeneric.inc:242
 #: plugins/admin/systems/class_printGeneric.inc:136
@@ -4353,42 +4677,6 @@ 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 ""
@@ -4427,27 +4715,44 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 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/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 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_servService.inc:240
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 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/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/server.tpl:6
@@ -4472,74 +4777,6 @@ 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"
@@ -4608,14 +4845,18 @@ msgstr ""
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:219
+#: plugins/admin/systems/class_terminalGeneric.inc:237
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_terminalGeneric.inc:241
 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 ""
@@ -4628,6 +4869,70 @@ 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 ""
@@ -4648,18 +4953,6 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr ""
-
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr ""
@@ -4799,15 +5092,8 @@ msgstr ""
 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"
+#: plugins/admin/systems/class_systemManagement.inc:707
+msgid "Network Device"
 msgstr ""
 
 #: plugins/admin/systems/class_systemManagement.inc:917
@@ -4826,12 +5112,16 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: 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_servDNS.inc:33
@@ -4852,6 +5142,29 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 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."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr ""
@@ -4978,6 +5291,14 @@ msgstr ""
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr ""
@@ -5054,6 +5375,82 @@ msgstr ""
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:13
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr ""
+
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr ""
@@ -5148,6 +5545,16 @@ msgstr ""
 msgid "User name of which terminal(s) are shown"
 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/service.tpl:4
 msgid "Keyboard"
 msgstr ""
@@ -5211,10 +5618,6 @@ msgstr ""
 msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/service.tpl:94
-msgid "Resolution"
-msgstr ""
-
 #: plugins/admin/systems/service.tpl:96
 msgid "Choose screen resolution used in graphic mode"
 msgstr ""
@@ -5323,16 +5726,6 @@ 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 ""
@@ -5502,80 +5895,44 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:13
-msgid "refresh"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_servNfs.inc:115
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_servNfs.inc:119
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
+#: plugins/admin/systems/class_servNfs.inc:123
+msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
@@ -5586,6 +5943,14 @@ msgstr ""
 msgid "Phone queue"
 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/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
@@ -5646,23 +6011,72 @@ msgstr ""
 msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Display objects matching"
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+msgid "Regular expression for matching object names"
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: 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_ogroupManagement.inc:362
+msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-msgid "Regular expression for matching object names"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:95
@@ -5725,55 +6139,6 @@ msgstr ""
 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 ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: 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_ogroupManagement.inc:362
-msgid "Create new object group"
-msgstr ""
-
-#: 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 ""
@@ -5782,6 +6147,16 @@ msgstr ""
 msgid "Member objects"
 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/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -5831,588 +6206,618 @@ msgstr ""
 msgid "Display object groups matching"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: 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_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
-msgid "ring all"
+#: plugins/admin/ogroups/phonequeue.tpl:46
+msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "round robin"
+#: 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_phonequeue.inc:81
-msgid "least recently called"
+#: plugins/admin/ogroups/phonequeue.tpl:62
+msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
-msgid "fewest completed calls"
+#: plugins/admin/ogroups/phonequeue.tpl:74
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid "random"
+#: plugins/admin/ogroups/phonequeue.tpl:82
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid "round robin with memory"
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:110
-msgid "Remove the phone queue from this Account"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:111
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
-msgid "Create phone queue"
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:116
+msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:160
-msgid "Uruguai"
+#: plugins/admin/ogroups/phonequeue.tpl:124
+msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:198
-msgid "Timeout must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
-msgid "Retry must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
-msgid "Max queue length must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
-msgid "Announce frequency must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
-msgid "There must be least one queue number defined."
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:233
-#: plugins/admin/ogroups/class_phonequeue.inc:590
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:230
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
-#: 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."
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:243
-#: plugins/admin/ogroups/class_phonequeue.inc:600
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
-#: 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."
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:270
-#: plugins/admin/ogroups/class_phonequeue.inc:473
-#: plugins/admin/ogroups/class_phonequeue.inc:635
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:502
-#: plugins/admin/ogroups/class_phonequeue.inc:504
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:997
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:383
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
-msgid "Generic queue Settings"
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:18
-msgid "Down"
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
+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/phonequeue.tpl:46
-msgid "Timeout"
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: 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/phonequeue.tpl:62
-msgid "Strategy"
+#: plugins/admin/ogroups/class_phonequeue.inc:160
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
+#: plugins/admin/ogroups/class_phonequeue.inc:198
+msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:201
+msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
+#: plugins/admin/ogroups/class_phonequeue.inc:204
+msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
+#: plugins/admin/ogroups/class_phonequeue.inc:207
+msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/ogroups/class_phonequeue.inc:210
+msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
+#: plugins/admin/ogroups/class_phonequeue.inc:233
+#: plugins/admin/ogroups/class_phonequeue.inc:596
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:71
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: 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/phonequeue.tpl:116
-msgid "Welcome sound file"
+#: plugins/admin/ogroups/class_phonequeue.inc:243
+#: plugins/admin/ogroups/class_phonequeue.inc:606
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:78
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:262
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: 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/phonequeue.tpl:124
-msgid "Announce message"
+#: 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/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
+#: 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:140
-msgid "'There are ...'"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
-msgid "'Thank you' message"
+#: 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/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
-msgid "Less Than sound file"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
-msgid "Phone attributes "
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
+#: 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/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/gofon/macro/class_gofonMacro.inc:250
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: 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/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:93
-msgid "no macro"
+#: plugins/gofon/macro/class_gofonMacro.inc:323
+#, php-format
+msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:110
-msgid "undefined"
+#: plugins/gofon/macro/class_gofonMacro.inc:328
+msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
-msgid "Error while performing query "
+#: 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/phoneaccount/class_phoneAccount.inc:502
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+#: plugins/gofon/macro/class_gofonMacro.inc:337
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
-msgid "This account has no phone extensions."
+#: plugins/gofon/macro/class_gofonMacro.inc:343
+msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
-msgid "Remove phone account"
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:611
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:614
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
-msgid "Create phone account"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
-msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:618
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:631
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:657
-msgid "Choose your private phone"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:765
-#, php-format
-msgid "You need to specify at least one phone number!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:769
-#, php-format
-msgid "You need to specify a Phone PIN."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
-msgid "The given PIN is too short"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:783
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:781
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
-msgid "Stop"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:962
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Phone PIN"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:51
-#: plugins/gofon/phoneaccount/generic.tpl:52
-msgid "Phone macro"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-msgid "Refresh"
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Complete"
+#: 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/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
+#: 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/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
+msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
-msgid "This 'dn' is no phone macro."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
+msgid "undefined"
 msgstr ""
 
-#: 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."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:482
+msgid "Error while performing query "
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:232
-#, php-format
-msgid "Unable to parse macro contents on line: %s"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:496
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:616
+msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:250
-#, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+#: 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/macro/class_gofonMacro.inc:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:626
+msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:323
-#, php-format
-msgid "The given cn '%s' already exists."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:630
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
+msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:328
-msgid "You must specify the 'Display Name' in order to save this macro"
+#: 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/macro/class_gofonMacro.inc:332
-msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:634
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:647
+msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:343
-msgid "Makro length must be lower than 100 lines"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:673
+msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
-msgid "Please choose a valid  base."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:767
+#, php-format
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
+#, php-format
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:940
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:975
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
 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."
+#: plugins/gofon/phoneaccount/generic.tpl:37
+msgid "Set voicemail password"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
+#: plugins/gofon/phoneaccount/generic.tpl:52
+#: plugins/gofon/phoneaccount/generic.tpl:53
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
+#: plugins/gofon/phoneaccount/generic.tpl:60
+msgid "Refresh"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Complete"
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: 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'."
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-msgid "Macro"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
+#: 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/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+msgid "Conference management"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:13
@@ -6423,6 +6828,7 @@ msgstr ""
 msgid "Name of conference to create"
 msgstr ""
 
+#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 msgid "Choose subtree to place conference in"
 msgstr ""
@@ -6476,12 +6882,20 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Create new conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "New conference"
+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"
+msgid "Name - Number"
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
@@ -6492,47 +6906,6 @@ msgstr ""
 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 ""
@@ -6556,19 +6929,43 @@ msgid ""
 "to your companies LDAP server."
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:8
-msgid ""
-"Use <b>Sign out</b> on the upper left to close the connection and <b>Main</"
-"b> to get back to the pictogram view."
+#: plugins/generic/welcome/welcome.tpl:8
+msgid ""
+"Use <b>Sign out</b> on the upper left to close the connection and <b>Main</"
+"b> to get back to the pictogram view."
+msgstr ""
+
+#: plugins/generic/welcome/welcome.tpl:15
+msgid "The GOsa team"
+msgstr ""
+
+#: plugins/generic/welcome/main.inc:24
+#, php-format
+msgid "Welcome %s!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:15
-msgid "The GOsa team"
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
 msgstr ""
 
-#: plugins/generic/welcome/main.inc:24
-#, php-format
-msgid "Welcome %s!"
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
 msgstr ""
 
 #: include/php_setup.inc:71
@@ -6765,44 +7162,38 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
+#: include/class_password-methods.inc:181 include/class_plugin.inc:426
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:398
-#, php-format
+#: include/class_password-methods.inc:202
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_plugin.inc:426 include/class_password-methods.inc:181
-#, php-format
+#: include/class_pluglist.inc:98
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_plugin.inc:454
-#, php-format
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
 #: include/class_config.inc:69
@@ -6818,18 +7209,8 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_password-methods.inc: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."
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
 #: include/class_password-methods-kerberos.inc:43
@@ -6846,8 +7227,14 @@ msgstr ""
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
 #: include/class_ldap.inc:438
@@ -6874,38 +7261,24 @@ msgstr ""
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
 msgstr ""
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/class_plugin.inc:398
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: include/class_plugin.inc:454
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -7336,26 +7709,6 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: 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:155
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-
-#: html/main.php:284
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:313
-msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
-msgstr ""
-
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7397,27 +7750,24 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: html/main.php:112
 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."
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
+#: html/main.php:155
+msgid "Warning: memory is getting low - please increase the memory_limit!"
 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"
+#: html/main.php:284
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: html/main.php:313
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -7442,6 +7792,36 @@ 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/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/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
@@ -7459,20 +7839,27 @@ msgstr ""
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
+#: 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/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"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."
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:15
@@ -7495,22 +7882,6 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr ""
-
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -7522,18 +7893,20 @@ msgid ""
 "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."
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4