Modified Translation Strings.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 01aeb07649409185a38866823d185e76b2f6c404..05df6665a48f942633847e6e5a293f12eb1a3962 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,17 +6,17 @@ 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
-#: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
-#: plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:59 contrib/gosa.conf:71 contrib/gosa.conf:80
+#: contrib/gosa.conf:86 contrib/gosa.conf:91 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:114 contrib/gosa.conf:122
+#: contrib/gosa.conf:127 contrib/gosa.conf:132 contrib/gosa.conf:137
+#: contrib/gosa.conf:142 contrib/gosa.conf:147
+#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
+#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
@@ -24,43 +24,49 @@ 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/environment/class_environment.inc:12
+#: plugins/admin/users/class_userManagement.inc:712
+msgid "Environment"
+msgstr ""
+
+#: contrib/gosa.conf:62 contrib/gosa.conf:74
 #: 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:714
 #: 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:63 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:720
 #: 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:64 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:65 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:718
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
+#: contrib/gosa.conf:66 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
@@ -68,7 +74,7 @@ msgstr ""
 #: 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:716
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -79,98 +85,101 @@ 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:67 contrib/gosa.conf:76 contrib/gosa.conf:82
+#: contrib/gosa.conf:87 contrib/gosa.conf:93 contrib/gosa.conf:101
+#: contrib/gosa.conf:110 contrib/gosa.conf:118 contrib/gosa.conf:123
+#: contrib/gosa.conf:128 contrib/gosa.conf:133 contrib/gosa.conf:138
+#: contrib/gosa.conf:143 contrib/gosa.conf:148
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:73
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:75
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:81 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:527
+#: contrib/gosa.conf:92 plugins/gofon/phoneaccount/class_phoneAccount.inc:636
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:89 contrib/gosa.conf:106
+#: contrib/gosa.conf:98 contrib/gosa.conf:115
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:90 contrib/gosa.conf:107
+#: contrib/gosa.conf:99 contrib/gosa.conf:116
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
+#: contrib/gosa.conf:100 contrib/gosa.conf:109 contrib/gosa.conf:117
 msgid "Monitoring"
 msgstr ""
 
-#: contrib/gosa.conf:97
+#: contrib/gosa.conf:106
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:107 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:160 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:161 plugins/personal/mail/generic.tpl:112
+#: plugins/personal/environment/logonManagement.tpl:53
+#: plugins/personal/environment/logonManagement.tpl:57
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:153
+#: contrib/gosa.conf:162
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:178
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:137
+#: contrib/gosa.conf:195 plugins/admin/ogroups/class_phonequeue.inc:160
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:196
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:197
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:198
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:199
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:200
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:192
+#: contrib/gosa.conf:201
 msgid "Italian"
 msgstr ""
 
@@ -182,6 +191,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
@@ -190,9 +201,12 @@ msgstr ""
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:35
+#: plugins/admin/ogroups/headpage.tpl:29
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:28
 msgid "Filters"
 msgstr ""
 
@@ -205,10 +219,12 @@ msgstr ""
 #: 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
 #: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 msgid "Choose the department the search will be based on"
 msgstr ""
@@ -238,13 +254,16 @@ msgstr ""
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/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
@@ -256,14 +275,15 @@ msgstr ""
 #: 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/generic.tpl:38
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
+#: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
 msgstr ""
 
@@ -277,6 +297,11 @@ msgstr ""
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/connectivity/main.inc:118
+#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialog.tpl:76
+#: plugins/personal/environment/selectPrinterDialog.tpl:75
+#: plugins/personal/environment/logonManagement.tpl:78
+#: plugins/personal/environment/hotplugDialogNew.tpl:30
 #: plugins/gofax/blocklists/generic.tpl:79
 #: plugins/gofax/blocklists/remove.tpl:17
 #: plugins/gofax/faxaccount/locals.tpl:64
@@ -291,7 +316,7 @@ msgstr ""
 #: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:613
+#: plugins/admin/users/class_userManagement.inc:617
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -299,12 +324,15 @@ msgstr ""
 #: 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/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:86
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: 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 ""
@@ -350,9 +378,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
@@ -364,13 +395,14 @@ 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/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/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/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
+#: 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/gofon/conference/remove.tpl:15
 msgid "Delete"
 msgstr ""
 
@@ -417,7 +449,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 ""
 
@@ -458,22 +491,25 @@ msgstr ""
 #: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/connectivity/main.inc:116
+#: plugins/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/users/class_userManagement.inc:615
 #: 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/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:261
 msgid "Finish"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
 #: plugins/personal/connectivity/main.inc:126
+#: plugins/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"
@@ -482,9 +518,13 @@ 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/environment.tpl:116
+#: plugins/personal/environment/main.inc:115
 #: 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/admin/systems/printer.tpl:56
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr ""
@@ -498,14 +538,15 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:17
 #: plugins/personal/samba/class_sambaAccount.inc:25
 #: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
 #: plugins/personal/connectivity/class_phpgwAccount.inc:6
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.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
@@ -521,9 +562,9 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:26
 #: plugins/admin/systems/class_systemManagement.inc:33
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 msgid "This does something"
 msgstr ""
 
@@ -634,7 +675,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:664
 msgid "Change password"
 msgstr ""
 
@@ -688,16 +729,16 @@ msgstr ""
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr ""
@@ -709,8 +750,8 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
 #: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr ""
 
@@ -795,20 +836,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"
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:6
@@ -893,7 +926,7 @@ 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 ""
@@ -921,7 +954,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 ""
 
@@ -931,7 +964,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:208
 msgid "automatic"
 msgstr ""
 
@@ -939,54 +972,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
@@ -997,7 +1030,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
@@ -1008,7 +1041,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
@@ -1019,7 +1052,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
@@ -1030,7 +1063,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
@@ -1041,7 +1074,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
@@ -1052,7 +1085,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
@@ -1063,7 +1096,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
@@ -1074,7 +1107,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
@@ -1085,7 +1118,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
@@ -1096,7 +1129,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
@@ -1107,7 +1140,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
@@ -1118,7 +1151,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
@@ -1127,81 +1160,81 @@ 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 ""
@@ -1538,7 +1571,7 @@ msgstr ""
 #: 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
+#: plugins/admin/departments/class_departmentGeneric.inc:166
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
@@ -1553,13 +1586,13 @@ msgstr ""
 #: 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
+#: plugins/admin/departments/class_departmentGeneric.inc:169
 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
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -1591,11 +1624,14 @@ msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/environment/logonManagement.tpl:10
+#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
+#: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
 
@@ -1640,10 +1676,10 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
 #: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
-#: plugins/admin/systems/printer.tpl:21
+#: plugins/admin/systems/printer.tpl:24
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
 
@@ -1703,7 +1739,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -1746,7 +1782,7 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:247
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/printer.tpl:14
+#: plugins/admin/systems/printer.tpl:44
 msgid "Location"
 msgstr ""
 
@@ -1822,6 +1858,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:114
+#: plugins/admin/systems/servnfs.tpl:85
 msgid "Save"
 msgstr ""
 
@@ -1841,9 +1878,9 @@ 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
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -1860,30 +1897,6 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
-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/pureftpd.tpl:1
 msgid "FTP account"
 msgstr ""
@@ -1906,6 +1919,7 @@ msgid "Download bandwidth"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:53
 msgid "Quota"
 msgstr ""
 
@@ -1933,12 +1947,32 @@ msgstr ""
 msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
+#: 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/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:1
@@ -1985,87 +2019,6 @@ msgstr ""
 msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
-msgstr ""
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr ""
-
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr ""
-
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr ""
@@ -2123,6 +2076,10 @@ msgstr ""
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
@@ -2148,6 +2105,42 @@ msgstr ""
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr ""
+
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr ""
@@ -2179,34 +2172,420 @@ msgstr ""
 msgid "PHP4 module for Postgresql Database Failed!"
 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/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:67
-#: 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
-msgid "Information"
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
+msgid "KB"
 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/connectivity/class_proxyAccount.inc:78
+msgid "GB"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "hour"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "day"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "week"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "month"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:130
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
+msgid "Numerical value for Quota Setting is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:3
+msgid "The environment extension is currently disabled."
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:6
+msgid "Environment managment settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:9
+msgid "Profiles"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:10
+msgid "Profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:17
+msgid "Use profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:24
+msgid "Profile server managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:27
+msgid "Profil server"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:39
+msgid "Use local caching"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:62
+#: plugins/admin/systems/service.tpl:94
+msgid "Resolution"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:76
+msgid "Resolution changeable on runtime"
+msgstr ""
+
+#: 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:105
+#: plugins/personal/environment/logonManagement.tpl:5
+msgid "Logon script management"
+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/main.inc:124
+msgid "User environment settings"
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:109
+msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:112
+msgid "Invalid character in description. Please specify a valid description."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:115
+msgid "Please specify a valid id."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+msgid "An Entry with this name already exists."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:126
+msgid "Please select an entry or press cancel."
+msgstr ""
+
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
+msgid "Please select a printer or press cancel."
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:1
+msgid "Select hotplug entry"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:5
+msgid "Hotplug management"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/systems/selectUserToPrinterDialog.tpl:24
+#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
+msgid "Information"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:28
+msgid "This menu allows you to select an existing hotplug configuration."
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:40
+msgid "Display hotplugs of department"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:43
+msgid "Choose the department the search will be based    on"
+msgstr ""
+
+#: 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/personal/environment/hotplugDialog.tpl:62
+msgid "Regular expression for        matching hotplugs"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialog.tpl:75
+#: plugins/personal/environment/selectPrinterDialog.tpl:74
+#: plugins/personal/environment/logonManagement.tpl:77
+msgid "Use"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:197
+#: plugins/personal/environment/class_environment.inc:229
+msgid "Remove environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:198
+#: plugins/personal/environment/class_environment.inc:230
+msgid ""
+"This server has environment extension enabled. You can disable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:202
+#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:234
+#: plugins/personal/environment/class_environment.inc:239
+msgid "Add environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:203
+#: plugins/personal/environment/class_environment.inc:235
+msgid ""
+"This server has environment extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:208
+#: plugins/personal/environment/class_environment.inc:240
+msgid ""
+"This server has environment extension disabled. You have to setup a posix "
+"account before you can enable this feature."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:615
+msgid "Please set a valid profile quota size."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:622
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:959
+msgid "Admin"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
+msgid "Select printer entry"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:5
+#: plugins/personal/environment/selectPrinterDialog.tpl:10
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:5
+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/logonManagement.tpl:1
+msgid "Logon management"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:8
+msgid "Logon script settings"
+msgstr ""
+
+#: 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:13
+#: 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/personal/environment/logonManagement.tpl:24
+msgid "Priority"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:35
+msgid "Logon script flags"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:40
+msgid "Last script"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:48
+msgid "Overloadable"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:65
+msgid "Logon script"
+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/hotplugDialogNew.tpl:1
+#: plugins/personal/environment/hotplugDialogNew.tpl:5
+msgid "Create new hotplug entry"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:21
+msgid "ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:29
+msgid "save"
+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/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:22
+msgid "Close"
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:93
+msgid "Specified name is invalid."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
+msgid "Specified description contains invalid characters."
+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
@@ -2243,7 +2622,8 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
+#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr ""
 
@@ -2251,18 +2631,6 @@ msgstr ""
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr ""
-
 #: plugins/gofax/blocklists/generic.tpl:43
 msgid "Descriptive text for this blocklist"
 msgstr ""
@@ -2294,67 +2662,73 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:652
 #: 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/users/class_userManagement.inc:652
 #: 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/users/class_userManagement.inc:653
 #: 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/users/class_userManagement.inc:653
 #: 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/users/class_userManagement.inc:654
 #: 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/users/class_userManagement.inc:654
 #: 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 ""
 
@@ -2368,67 +2742,73 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:659
 #: 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/users/class_userManagement.inc:660
 #: 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/users/class_userManagement.inc:660
 #: 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/users/class_userManagement.inc:663
 #: 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/admin/users/class_userManagement.inc:663
 #: 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/users/class_userManagement.inc:665
 #: 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/admin/users/class_userManagement.inc:665
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr ""
@@ -2440,12 +2820,13 @@ 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/users/class_userManagement.inc:674
 #: 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 ""
 
@@ -2461,24 +2842,24 @@ msgstr ""
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:526
+#: 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:532
-#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
+#: plugins/admin/departments/class_departmentGeneric.inc:154
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:535
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:550
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
@@ -2487,9 +2868,9 @@ msgstr ""
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6
+#: plugins/gofon/conference/remove.tpl:2 html/index.php:231
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr ""
 
@@ -2613,7 +2994,7 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1276
 msgid "Apply"
 msgstr ""
 
@@ -2713,6 +3094,7 @@ msgid "Search"
 msgstr ""
 
 #: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/systems/class_printGeneric.inc:482
 #: plugins/admin/ogroups/class_ogroupManagement.inc:479
 msgid "User"
 msgstr ""
@@ -3033,11 +3415,6 @@ msgstr ""
 msgid "Select CSV file to import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-msgid "Browse"
-msgstr ""
-
 #: plugins/addons/ldapmanager/contentcsv.tpl:19
 msgid "Select template"
 msgstr ""
@@ -3349,15 +3726,11 @@ 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
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Edit this entry"
 msgstr ""
 
@@ -3365,11 +3738,13 @@ msgstr ""
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
 msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:710
 msgid "Posix"
 msgstr ""
 
@@ -3386,11 +3761,12 @@ msgid "Groupname"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:673
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
 
@@ -3570,11 +3946,6 @@ msgstr ""
 msgid "Display users of department"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-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"
@@ -3703,6 +4074,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
+#: plugins/admin/systems/printer.tpl:75
 msgid "Users"
 msgstr ""
 
@@ -3730,84 +4102,88 @@ msgstr ""
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:656
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:656
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:657
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:657
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:664
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:672
 #: 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/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:677
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:708
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:709
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:711
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:713
+msgid "Edit environment properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:715
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:719
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:722
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:778
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:785
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:981
+#: plugins/admin/users/class_userManagement.inc:993
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -3826,9 +4202,9 @@ 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/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
@@ -4034,6 +4410,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
+#: plugins/gofon/conference/generic.tpl:57
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -4046,6 +4423,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
+#: plugins/gofon/conference/generic.tpl:122
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -4069,7 +4447,12 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
+#: plugins/admin/departments/tabs_department.inc:30
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:7
+#: plugins/gofon/conference/remove.tpl:7
 msgid ""
 "This includes <b>all</b> accounts, systems, etc. in this subtree. Please "
 "double check if your really want to do this since there is no way for GOsa "
@@ -4077,6 +4460,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:11 plugins/admin/systems/remove.tpl:11
+#: plugins/gofon/conference/remove.tpl:11
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
@@ -4087,24 +4471,24 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
+#: plugins/admin/departments/class_departmentGeneric.inc:140
 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
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/admin/departments/class_departmentGeneric.inc:149
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
+#: plugins/admin/departments/class_departmentGeneric.inc:157
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
+#: plugins/admin/departments/class_departmentGeneric.inc:162
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
+#: plugins/admin/departments/class_departmentGeneric.inc:163
 msgid " Please choose another name."
 msgstr ""
 
@@ -4115,11 +4499,13 @@ msgid "Departments"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:175
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:202
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:192
 msgid "You have no permission to remove this department."
 msgstr ""
 
@@ -4339,10 +4725,10 @@ 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
+#: plugins/admin/systems/class_printGeneric.inc:368
 #: plugins/admin/systems/class_componentGeneric.inc:133
 #: plugins/admin/systems/class_phoneGeneric.inc:299
 #, php-format
@@ -4363,7 +4749,7 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
 #: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/printer.tpl:26
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
@@ -4481,7 +4867,7 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
+#: plugins/admin/systems/class_servService.inc:240
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
@@ -4494,15 +4880,39 @@ msgid "Workstation name"
 msgstr ""
 
 #: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:9
 msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:32
+#: plugins/admin/systems/printer.tpl:41
+msgid "Details"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:48
 msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/printer.tpl:56
+msgid "PPD"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:66
+msgid "Permissions"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:74
+msgid "Following objects are assigned as user."
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:91
+msgid "Following objects are assigned as admin."
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:92
+msgid "Admins"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -4573,11 +4983,11 @@ 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 ""
 
@@ -4756,26 +5166,19 @@ msgstr ""
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:893
+#: plugins/admin/systems/class_systemManagement.inc:917
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:896
+#: plugins/admin/systems/class_systemManagement.inc:920
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:913
+#: plugins/admin/systems/class_systemManagement.inc:937
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:948
 msgid "Workstation template for"
 msgstr ""
 
@@ -5108,88 +5511,57 @@ 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/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_printGeneric.inc:153
+#: plugins/admin/systems/class_printGeneric.inc:156
+msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/systems/class_printGeneric.inc:154
+msgid ""
+"This workstation has printer extension enabled. You can disable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
+#: plugins/admin/systems/class_printGeneric.inc:157
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_printGeneric.inc:161
+#: plugins/admin/systems/class_printGeneric.inc:164
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_printGeneric.inc:162
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
+#: plugins/admin/systems/class_printGeneric.inc:165
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
+#: plugins/admin/systems/class_printGeneric.inc:175
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/class_printGeneric.inc:293
+msgid "Undefined"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/class_printGeneric.inc:358
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
+#: plugins/admin/systems/class_printGeneric.inc:477
+#: plugins/admin/systems/class_printGeneric.inc:479
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
 msgstr ""
 
 #: plugins/admin/systems/password.tpl:2
@@ -5267,10 +5639,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 ""
@@ -5501,6 +5869,22 @@ msgstr ""
 msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
 
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
+msgstr ""
+
 #: plugins/admin/systems/class_phoneGeneric.inc:102
 msgid "This 'dn' has no phone features."
 msgstr ""
@@ -5546,31 +5930,132 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/systems/class_servNfs.inc:115
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/systems/class_servNfs.inc:119
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
+#: plugins/admin/systems/class_servNfs.inc:123
+msgid "Option contains invalid characters."
+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/selectUserToPrinterDialog.tpl:1
+msgid "Select entry"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
+msgid "Select user/group to add"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+msgid ""
+"This menu allows you to select one or multiple users or groups to add them "
+"to the printer. \n"
+"\t\t\t\t\t\t\tHaving a great number of users, you may want to use the range "
+"selectors on top of this list."
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
+msgid "Display members of department"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+msgid "Display members matching"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
+msgid "Regular expression for matching member names"
 msgstr ""
 
 #: plugins/admin/ogroups/headpage.tpl:24
@@ -5624,6 +6109,14 @@ msgstr ""
 msgid "Member objects"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
@@ -5692,11 +6185,22 @@ msgstr ""
 msgid "Regular expression for matching object names"
 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/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 ""
@@ -5736,11 +6240,6 @@ msgstr ""
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr ""
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -5853,7 +6352,7 @@ msgid "(in seconds)"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound file setup"
+msgid "Queue sound setup"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:99
@@ -5900,38 +6399,46 @@ msgstr ""
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:197
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:204
 msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:202
+#: plugins/admin/ogroups/phonequeue.tpl:212
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:218
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:214
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:220
-msgid "Additional phone attributes "
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:225
+#: plugins/admin/ogroups/phonequeue.tpl:234
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:231
+#: plugins/admin/ogroups/phonequeue.tpl:240
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:237
+#: plugins/admin/ogroups/phonequeue.tpl:246
 msgid "Ring instead of playing background music"
 msgstr ""
 
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr ""
+
 #: plugins/admin/ogroups/class_mailogroup.inc:38
 msgid ""
 "This group has mail features enabled. You can disable them by clicking below."
@@ -5942,108 +6449,301 @@ msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:86
-msgid "Remove the phone queue from this Account"
+#: plugins/admin/ogroups/class_phonequeue.inc:79
+msgid "ring all"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:87
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:80
+msgid "round robin"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:89
-msgid "Create phone queue"
+#: plugins/admin/ogroups/class_phonequeue.inc:81
+msgid "least recently called"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:89
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:82
+msgid "fewest completed calls"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "Uruguai"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+msgid "random"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring all"
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "round robin"
+#: plugins/admin/ogroups/class_phonequeue.inc:110
+msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "least recently called"
+#: plugins/admin/ogroups/class_phonequeue.inc:111
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "fewest completed calls"
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:142
-msgid "random"
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:143
-msgid "round robin with memory"
+#: plugins/admin/ogroups/class_phonequeue.inc:160
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
+#: plugins/admin/ogroups/class_phonequeue.inc:198
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
+#: plugins/admin/ogroups/class_phonequeue.inc:204
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:191
+#: plugins/admin/ogroups/class_phonequeue.inc:207
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:194
+#: plugins/admin/ogroups/class_phonequeue.inc:210
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:217
-#: plugins/admin/ogroups/class_phonequeue.inc:572
+#: plugins/admin/ogroups/class_phonequeue.inc:233
+#: plugins/admin/ogroups/class_phonequeue.inc:596
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:72
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:277
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1008
 #: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:227
-#: plugins/admin/ogroups/class_phonequeue.inc:582
+#: plugins/admin/ogroups/class_phonequeue.inc:243
+#: plugins/admin/ogroups/class_phonequeue.inc:606
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:288
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
 #: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:254
-#: plugins/admin/ogroups/class_phonequeue.inc:457
-#: plugins/admin/ogroups/class_phonequeue.inc:617
+#: plugins/admin/ogroups/class_phonequeue.inc:274
+#: plugins/admin/ogroups/class_phonequeue.inc:478
+#: plugins/admin/ogroups/class_phonequeue.inc:642
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:486
-#: plugins/admin/ogroups/class_phonequeue.inc:488
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#: plugins/admin/ogroups/class_phonequeue.inc:507
+#: plugins/admin/ogroups/class_phonequeue.inc:509
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1121
+#: 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/gofon/phoneaccount/generic.tpl:33
+msgid "Voicemail PIN"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:37
+msgid "Set phone password"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Phone PIN"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:46
+msgid "Set voicemail password"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:62
+msgid "Phone macro"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:69
+msgid "Refresh"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:70
+msgid "Complete"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+msgid "no macro"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:134
+msgid "undefined"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+msgid ""
+"You are currently creating a new phone account, please specify a value for "
+"phone PIN and voice PIN."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:311
+msgid ""
+"The PIN attribute is missing in database entry. Please assign a valid phone "
+"PIN."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:318
+msgid ""
+"The voice PIN attribute is missing in database entry. Please assign a valid "
+"voice PIN."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:566
+msgid "Error while performing query "
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:580
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:722
+msgid "This account has no phone extensions."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:597
+msgid "Voicemail PIN must be between 1-4 characters."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
+msgid ""
+"The specified Voicemail PIN contains invalid characters, only numeric values "
+"are allowed here."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:609
+msgid "Phone PIN must be 4 characters long."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:612
+msgid ""
+"The specified phone PIN contains invalid characters, only numeric values are "
+"allowed here."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+msgid ""
+"The macro you selected, is no longer available for you, please choose "
+"another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:732
+msgid "Remove phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:733
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:736
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+msgid "Create phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:737
+msgid ""
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
+msgid "Please enter a valid phone number!"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:783
+msgid "Choose your private phone"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:880
+#, php-format
+msgid "You need to specify at least one phone number!"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:887
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1051
+msgid "Stop"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1086
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr ""
+
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr ""
+
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr ""
+
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr ""
+
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr ""
+
 #: plugins/gofon/macro/headpage.tpl:6
 msgid "List of macros"
 msgstr ""
@@ -6212,12 +6912,6 @@ msgstr ""
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
@@ -6234,170 +6928,131 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Phone PIN"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:47
-msgid "Forward calls to"
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:49
-#: plugins/gofon/phoneaccount/generic.tpl:51
-msgid "Phone number"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:51
-msgid "Timeout (s)"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:65
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "Phone macro"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:73
-msgid "Refresh"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:74
-msgid "Complete"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
-msgid "no macro"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
-msgid "undefined"
+#: 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/phoneaccount/class_phoneAccount.inc:468
-msgid "Error while performing query "
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+#: plugins/gofon/conference/generic.tpl:13
+msgid "Conference name"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
-msgid "This account has no phone extensions."
+#: plugins/gofon/conference/generic.tpl:18
+msgid "Name of conference to create"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
-msgid "Remove phone account"
+#: plugins/gofon/conference/generic.tpl:24
+#: plugins/gofon/conference/generic.tpl:35
+msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/conference/generic.tpl:62
+msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/gofon/conference/generic.tpl:70
+msgid "Phone number"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
-msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+#: plugins/gofon/conference/generic.tpl:99
+msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/conference/generic.tpl:113
+msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
-msgid "Choose your private phone"
+#: plugins/gofon/conference/generic.tpl:121
+msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
-#, php-format
-msgid "You need to specify at least one phone number!"
+#: plugins/gofon/conference/generic.tpl:138
+msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
-#, php-format
-msgid "You need to specify a Phone PIN."
+#: plugins/gofon/conference/generic.tpl:144
+msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+#: plugins/gofon/conference/generic.tpl:150
+msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
-#, php-format
-msgid "The given PIN is too short"
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
-#, php-format
-msgid "The number '%s' is no valid phone number!"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
+msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+msgid "Owner"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:360
+msgid "Conference"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
-
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
+
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+msgid "Conference management"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:46
@@ -6438,30 +7093,6 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr ""
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr ""
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -6581,22 +7212,22 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:991
+#: include/functions.inc:997
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1090
+#: include/functions.inc:1096
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1544
+#: include/functions.inc:1550
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1587
+#: include/functions.inc:1593
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -6686,6 +7317,20 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+
 #: include/class_password-methods.inc:165
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
@@ -6696,18 +7341,95 @@ msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_pluglist.inc:98
+#: include/class_ppdManager.inc:57
+#, php-format
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Parsing PPD file %s faild - line too long. Trailing characters have been "
+"ignored"
 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
+#: include/class_ppdManager.inc:78
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr ""
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
+#: include/class_ldap.inc:438
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr ""
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -7097,37 +7819,6 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr ""
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr ""
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-
 #: include/functions_helpviewer.inc:260
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
@@ -7138,48 +7829,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:700
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
-
-#: html/helpviewer.php:85
-msgid "previous"
-msgstr ""
-
-#: html/helpviewer.php:89
-msgid "next"
-msgstr ""
-
-#: html/helpviewer.php:141
-#, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
-msgstr ""
-
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
@@ -7223,6 +7872,24 @@ msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "next"
+msgstr ""
+
+#: html/helpviewer.php:141
+#, php-format
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgstr ""
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7342,20 +8009,6 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7390,9 +8043,9 @@ 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_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 ""
 
@@ -7584,12 +8237,18 @@ msgid ""
 "execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: 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/default/help.tpl:15
-msgid "Index"
+#: 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/default/setup_step4.tpl:100
@@ -7598,3 +8257,11 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting. "
 "(But it could be a security risk)  "
 msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""