Added missing files

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 738447c882ce6c1196c5c26eb850982ad5b46d9c..a57fa2a6626ced7db8e760d3c9d7aa7cfa69b8ec 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,15 +6,15 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:42
+#: contrib/gosa.conf:44
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:57 contrib/gosa.conf:68 contrib/gosa.conf:76
-#: contrib/gosa.conf:82 contrib/gosa.conf:88 contrib/gosa.conf:96
-#: contrib/gosa.conf:105 contrib/gosa.conf:113 contrib/gosa.conf:118
-#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
-#: contrib/gosa.conf:138 plugins/personal/mail/generic.tpl:4
+#: contrib/gosa.conf:59 contrib/gosa.conf:70 contrib/gosa.conf:78
+#: contrib/gosa.conf:84 contrib/gosa.conf:90 contrib/gosa.conf:98
+#: contrib/gosa.conf:107 contrib/gosa.conf:115 contrib/gosa.conf:120
+#: contrib/gosa.conf:125 contrib/gosa.conf:130 contrib/gosa.conf:135
+#: contrib/gosa.conf:140 plugins/personal/mail/generic.tpl:4
 #: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -24,51 +24,51 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:58
+#: contrib/gosa.conf:60
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:59 contrib/gosa.conf:70
+#: contrib/gosa.conf:61 contrib/gosa.conf:72
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:62 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:716
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:63 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:64 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
+#: contrib/gosa.conf:65 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -79,280 +79,185 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:64 contrib/gosa.conf:72 contrib/gosa.conf:78
-#: contrib/gosa.conf:84 contrib/gosa.conf:92 contrib/gosa.conf:101
-#: contrib/gosa.conf:109 contrib/gosa.conf:114 contrib/gosa.conf:119
-#: contrib/gosa.conf:124 contrib/gosa.conf:129 contrib/gosa.conf:134
-#: contrib/gosa.conf:139
+#: contrib/gosa.conf:66 contrib/gosa.conf:74 contrib/gosa.conf:80
+#: contrib/gosa.conf:86 contrib/gosa.conf:94 contrib/gosa.conf:103
+#: contrib/gosa.conf:111 contrib/gosa.conf:116 contrib/gosa.conf:121
+#: contrib/gosa.conf:126 contrib/gosa.conf:131 contrib/gosa.conf:136
+#: contrib/gosa.conf:141
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:71
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:73
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:79 plugins/admin/ogroups/phonequeue.tpl:31
+#: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
+#: contrib/gosa.conf:85 plugins/gofon/phoneaccount/class_phoneAccount.inc:533
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:89 contrib/gosa.conf:106
+#: contrib/gosa.conf:91 contrib/gosa.conf:108
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:90 contrib/gosa.conf:107
+#: contrib/gosa.conf:92 contrib/gosa.conf:109
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
+#: contrib/gosa.conf:93 contrib/gosa.conf:102 contrib/gosa.conf:110
 msgid "Monitoring"
 msgstr ""
 
-#: contrib/gosa.conf:97
+#: contrib/gosa.conf:99
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:100 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:153 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:154 plugins/personal/mail/generic.tpl:112
+#: plugins/personal/environment/logonManagement.tpl:53
+#: plugins/personal/environment/logonManagement.tpl:57
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:153
+#: contrib/gosa.conf:155
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:171
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
+#: contrib/gosa.conf:188 plugins/admin/ogroups/class_phonequeue.inc:160
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:189
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:190
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:191
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:192
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:193
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:192
+#: contrib/gosa.conf:194
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/admin/ogroups/mail.tpl:10
+msgid "Primary address"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
+#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
+#: plugins/personal/mail/generic.tpl:13
+msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/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/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
+msgid "not defined"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
+msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/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/mail/mail_locals.tpl:41
 #: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:102
 #: 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
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/generic.tpl:88
 #: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/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/startup.tpl:95
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:51
-#: 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/template.tpl:46
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:529
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
-#: plugins/admin/ogroups/mail.tpl:10
-msgid "Primary address"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:703
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:13
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:147
-msgid "not defined"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
-msgid "Alternative addresses"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
-msgid "List of alternative mail addresses"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl: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 +269,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/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/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
+#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/conference/remove.tpl:15
 msgid "Delete"
 msgstr ""
 
@@ -417,7 +323,8 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/environment/environment.tpl:57
 msgid "MB"
 msgstr ""
 
@@ -454,45 +361,6 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:611
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:527
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/gofon/phoneaccount/main.inc:112
-msgid "Edit"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr ""
-
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
@@ -506,6 +374,7 @@ msgstr ""
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/environment/class_environment.inc:13
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/reports/class_faxreport.inc:7
@@ -632,45 +501,217 @@ msgstr ""
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:660
-msgid "Change password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:6
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
-msgstr ""
-
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
-msgid ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
-msgstr ""
-
-#: plugins/personal/password/password.tpl:15
-msgid "Current password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:20
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:11
-msgid "New password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:25
-#: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
-msgid "Repeat new password"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/personal/environment/main.inc:104
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:611
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:261
+msgid "Finish"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:34
-#: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/main.inc:112
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/main.inc:106
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialog.tpl:76
+#: plugins/personal/environment/logonManagement.tpl:78
+#: plugins/personal/environment/hotplugDialogNew.tpl:30
+#: plugins/personal/environment/selectPrinterDialog.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
+#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
+#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:529
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:86
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/conference/remove.tpl:17
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:263
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/environment/main.inc:114
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
+#: plugins/personal/connectivity/main.inc:127
+#: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:116
+#: plugins/gofax/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/gofon/phoneaccount/main.inc:112
+msgid "Edit"
+msgstr ""
+
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl: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
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:28
+msgid "Filters"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/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/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
+#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
+#: plugins/admin/systems/servdb.tpl:109
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:660
+msgid "Change password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:6
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+
+#: plugins/personal/password/password.tpl:10
+#: plugins/admin/users/password.tpl:6
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+
+#: plugins/personal/password/password.tpl:15
+msgid "Current password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:20
+#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: plugins/admin/systems/password.tpl:11
+msgid "New password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:25
+#: plugins/personal/generic/password.tpl:11
+#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
+msgid "Repeat new password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:34
+#: plugins/personal/generic/password.tpl:17
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr ""
 
@@ -686,8 +727,8 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: 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/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
@@ -702,18 +743,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:649
-#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
-#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
-msgid "Password"
-msgstr ""
-
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -752,65 +781,6 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:626
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
-#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr ""
-
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr ""
@@ -893,7 +863,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 ""
@@ -911,8 +881,55 @@ msgstr ""
 msgid "Display systems matching"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
+#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
@@ -921,7 +938,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Group of user"
 msgstr ""
 
@@ -931,7 +948,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:207
 msgid "automatic"
 msgstr ""
 
@@ -939,54 +956,54 @@ msgstr ""
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:239
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:241
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
-"remove the samba account first."
+"remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:243
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:431
+#: plugins/personal/posix/class_posixAccount.inc:432
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:434
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:436
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -997,7 +1014,7 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1008,7 +1025,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1019,7 +1036,7 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1030,7 +1047,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1041,7 +1058,7 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1052,7 +1069,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1063,7 +1080,7 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1074,7 +1091,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1085,7 +1102,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1096,7 +1113,7 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1107,7 +1124,7 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1118,7 +1135,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 #: plugins/personal/samba/class_sambaAccount.inc:450
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
@@ -1127,85 +1144,89 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:543
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:710
+#: plugins/personal/posix/class_posixAccount.inc:711
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:862
+#: plugins/personal/posix/class_posixAccount.inc:866
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:865
+#: plugins/personal/posix/class_posixAccount.inc:869
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:873
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:876
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:884
 #: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/personal/posix/class_posixAccount.inc:887
 #: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:895
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:896
+#: plugins/personal/posix/class_posixAccount.inc:900
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:905
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:911
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:914
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1031
 #: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr ""
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1332,10 +1353,6 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1348,6 +1365,10 @@ msgstr ""
 msgid "Display workstations matching"
 msgstr ""
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr ""
@@ -1440,162 +1461,45 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:529
-msgid "The required field 'Name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:532
-msgid "The required field 'Given name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:912
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/generic/password.tpl:2
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/generic/generic_picture.tpl:6
+#: plugins/personal/generic/generic.tpl:15
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1070
-msgid "Could not open specified certificate!"
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+#: plugins/admin/systems/servnfs.tpl:85
+msgid "Save"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:15
-#: plugins/personal/generic/generic_picture.tpl:6
-msgid "Personal picture"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:17
 msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/personal/environment/logonManagement.tpl:10
+#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/contents.tpl:14
 #: 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 ""
 
@@ -1638,12 +1542,12 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/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/server.tpl:13 plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
+#: plugins/admin/systems/workstation.tpl:18
 #: plugins/admin/systems/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 ""
 
@@ -1731,8 +1635,8 @@ msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:51
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr ""
@@ -1809,30 +1713,6 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr ""
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1841,9 +1721,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,8 +1740,149 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:529
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:16
@@ -1884,105 +1905,110 @@ msgstr ""
 msgid "per"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:53
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
@@ -2022,42 +2048,38 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
+#: plugins/personal/connectivity/class_proxyAccount.inc:130
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr ""
-
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr ""
@@ -2148,6 +2170,10 @@ msgstr ""
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr ""
@@ -2183,96 +2209,348 @@ msgstr ""
 msgid "This account has no connectivity extensions."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
+#: plugins/personal/environment/class_environment.inc:12
+#: plugins/admin/users/class_userManagement.inc:708
+msgid "Environment"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/personal/environment/class_environment.inc:184
+msgid "Remove environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:185
+msgid ""
+"This server has environment extension enabled. You can disable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:189
+#: plugins/personal/environment/class_environment.inc:194
+msgid "Add environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:190
+msgid ""
+"This server has environment extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:195
+msgid ""
+"This server has environment extension disabled. You have to setup a posix "
+"account before you can enable this feature."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:569
+msgid "Please set a valid profile quota size."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:573
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:908
+msgid "Admin"
+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."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:112
+msgid "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:119
+msgid "Please select an entry or press cancel."
+msgstr ""
+
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+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/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
 #: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl: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"
+#: plugins/personal/environment/hotplugDialog.tpl:28
+msgid "This menu allows you to select an existing hotplug configuration."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:40
+msgid "Display hotplugs of department"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:43
+msgid "Choose the department the search will be based    on"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
+#: plugins/personal/environment/hotplugDialog.tpl:57
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+#: plugins/gofon/conference/headpage.tpl:34
+msgid "Display users matching"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
+#: plugins/personal/environment/hotplugDialog.tpl:62
+msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
+#: plugins/personal/environment/hotplugDialog.tpl:75
+#: plugins/personal/environment/logonManagement.tpl:77
+#: plugins/personal/environment/selectPrinterDialog.tpl:74
+msgid "Use"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
+#: plugins/personal/environment/class_logonManagementDialog.inc:92
+msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
+msgid "Specified decription contains invalid characters."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
+#: plugins/personal/environment/logonManagement.tpl:1
+msgid "Logon management"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
+#: plugins/personal/environment/logonManagement.tpl:5
+#: plugins/personal/environment/environment.tpl:105
+msgid "Logon script management"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
+#: 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:10
 #: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:51
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
+#: plugins/personal/environment/logonManagement.tpl:24
+msgid "Priority"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
+#: plugins/personal/environment/logonManagement.tpl:35
+msgid "Logon script flags"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
+#: plugins/personal/environment/logonManagement.tpl:40
+msgid "Last proceeded script"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:48
+msgid "Overloadable"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:65
+msgid "Logon script"
+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/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:122
+msgid "Attach share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:142
+msgid "Hotplug devices"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:143
+msgid "Hotplug device settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:153
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:154
+msgid "Existing"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:160
+#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:161
+msgid "Printer settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:171
+msgid "Admin Toggle"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
+msgid "Select printer entry"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:5
+#: plugins/personal/environment/selectPrinterDialog.tpl:10
+msgid "Select printer to add"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:28
+msgid ""
+"This menu allows you to create, edit and delete selected printers. \n"
+"\t\t\t\t\t\t\tHaving a great number of printers, you may want to use the "
+"range selectors on top of the printers list."
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:41
+msgid "Display printers of department"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:58
+msgid "Display printers matching"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:63
+msgid "Regular expression for matching printer names"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:80
+#, php-format
+msgid "Can't open '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
+msgid "Kiosk profile management"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:12
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+msgid "Browse"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:22
+msgid "Close"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
@@ -2300,6 +2578,7 @@ msgstr ""
 #: 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 ""
 
@@ -2312,6 +2591,7 @@ msgstr ""
 #: 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 ""
 
@@ -2323,6 +2603,7 @@ msgstr ""
 #: 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 ""
 
@@ -2334,6 +2615,7 @@ msgstr ""
 #: 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 ""
 
@@ -2344,6 +2626,7 @@ msgstr ""
 #: 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 ""
 
@@ -2355,6 +2638,7 @@ msgstr ""
 #: 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 ""
 
@@ -2374,6 +2658,7 @@ msgstr ""
 #: 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 ""
 
@@ -2385,6 +2670,7 @@ msgstr ""
 #: 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 ""
 
@@ -2396,6 +2682,7 @@ msgstr ""
 #: 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 ""
 
@@ -2407,6 +2694,7 @@ msgstr ""
 #: 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 ""
 
@@ -2424,6 +2712,8 @@ msgstr ""
 #: 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 ""
 
@@ -2446,6 +2736,7 @@ msgstr ""
 #: 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,25 +2752,60 @@ 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/gofax/blocklists/class_blocklistManagement.inc:531
 #: plugins/admin/departments/class_departmentGeneric.inc:147
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:535
-msgid "Required field 'Name' contains invalid characters"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+msgid "Required field 'Name' contains invalid characters"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+msgid "Specified name is already used."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
+msgid "No permission to create a blocklist on this base."
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
+msgid "Type"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr ""
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
-msgid "Specified name is already used."
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:550
-msgid "No permission to create a blocklist on this base."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:2
@@ -2487,9 +2813,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 ""
 
@@ -2508,6 +2834,41 @@ msgid ""
 "abort."
 msgstr ""
 
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr ""
+
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2678,69 +3039,6 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
-msgid "Enter user name to search for"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
-msgid "in"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
-msgid "Select subtree to base search on"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
-msgid "during"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-msgid "Search"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
-msgid "Date"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:33
-msgid "Sender"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:34
-msgid "Receiver"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
-msgid "# pages"
-msgstr ""
-
-#: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
-msgid "Search returned no results..."
-msgstr ""
-
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr ""
@@ -2753,6 +3051,11 @@ msgstr ""
 msgid "FAX ID"
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr ""
+
 #: plugins/gofax/reports/detail.tpl:26
 msgid "Date / Time"
 msgstr ""
@@ -2781,8 +3084,8 @@ msgstr ""
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+msgid "# pages"
 msgstr ""
 
 #: plugins/gofax/reports/class_faxreport.inc:6
@@ -2814,65 +3117,62 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:40
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:15
-msgid "Contact"
-msgstr ""
-
-#: plugins/addons/addressbook/contents.tpl:37
-msgid ""
-"The telephone list plugin provides list and search facilities for the people "
-"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
-"find 'Gonicus'. Use the filters below to narrow down your search."
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:47
-msgid "Add entry"
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:50
-msgid "Edit entry"
+#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+msgid "Enter user name to search for"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:52
-msgid "Remove entry"
+#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
+#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+msgid "in"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Select to see regular users"
+#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+msgid "Select subtree to base search on"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:68
-msgid "Show organizational entries"
+#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+msgid "during"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Select to see users in addressbook"
+#: plugins/gofax/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+msgid "Search"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:69
-msgid "Show addressbook entries"
+#: plugins/gofax/reports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/reports/contents.tpl:30
+msgid "Date"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:77
-msgid "Display results for department"
+#: plugins/gofax/reports/contents.tpl:33
+msgid "Sender"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:90
-msgid "Match object"
+#: plugins/gofax/reports/contents.tpl:34
+msgid "Receiver"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:93
-msgid "Choose the object that will be searched in"
+#: plugins/gofax/reports/contents.tpl:47
+#: plugins/addons/logview/contents.tpl:97
+#: plugins/gofon/reports/contents.tpl:48
+msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:105
-msgid "Search string"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:3
@@ -2887,13 +3187,6 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr ""
@@ -2908,6 +3201,12 @@ msgstr ""
 msgid "Initials"
 msgstr ""
 
+#: plugins/addons/addressbook/address_edit.tpl:40
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr ""
+
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:43
 msgid "Email"
@@ -2923,14 +3222,76 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:15
+msgid "Contact"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:37
+msgid ""
+"The telephone list plugin provides list and search facilities for the people "
+"in your site. You may want to specify the asterisk [*] like in 'Go*us' to "
+"find 'Gonicus'. Use the filters below to narrow down your search."
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:47
+msgid "Add entry"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:50
+msgid "Edit entry"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:52
+msgid "Remove entry"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Select to see regular users"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:68
+msgid "Show organizational entries"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Select to see users in addressbook"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:69
+msgid "Show addressbook entries"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:77
+msgid "Display results for department"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:90
+msgid "Match object"
+msgstr ""
+
+#: plugins/addons/addressbook/contents.tpl:93
+msgid "Choose the object that will be searched in"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
+#: plugins/addons/addressbook/contents.tpl:105
+msgid "Search string"
+msgstr ""
+
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
 msgstr ""
 
 #: plugins/addons/addressbook/main.inc:23
@@ -3021,48 +3382,6 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-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 ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr ""
-
-#: plugins/addons/ldapmanager/main.inc:23
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-msgid "LDAP manager"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3138,6 +3457,38 @@ msgstr ""
 msgid "Import successful"
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr ""
@@ -3182,6 +3533,11 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+#: plugins/addons/ldapmanager/main.inc:23
+msgid "LDAP manager"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr ""
@@ -3194,42 +3550,6 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr ""
-
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
-msgstr ""
-
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr ""
@@ -3285,15 +3605,40 @@ msgstr ""
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr ""
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11
@@ -3320,16 +3665,6 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3349,15 +3684,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,6 +3696,8 @@ 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 ""
 
@@ -3391,6 +3724,7 @@ msgstr ""
 #: 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 ""
 
@@ -3445,28 +3779,25 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr ""
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
+#: plugins/admin/groups/remove.tpl:7
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:153
@@ -3505,17 +3836,58 @@ msgstr ""
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:646
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:650
+msgid "Please select a valid mail server."
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr ""
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:650
-msgid "Please select a valid mail server."
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
@@ -3562,30 +3934,8 @@ msgstr ""
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-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"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
 #: plugins/admin/groups/application_options.tpl:1
@@ -3629,72 +3979,6 @@ msgstr ""
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr ""
-
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3752,8 +4036,8 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:668
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
@@ -3776,38 +4060,42 @@ msgid "Edit UNIX properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:709
-msgid "Edit mail properties"
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:711
-msgid "Edit phone properties"
+msgid "Edit mail properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:713
-msgid "Edit fax properies"
+msgid "Edit phone properties"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:715
+msgid "Edit fax properies"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:718
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:719
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:774
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:781
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:981
+#: plugins/admin/users/class_userManagement.inc:989
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -3836,27 +4124,109 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:24
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr ""
+
 #: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
 msgid "User administration"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+"This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -3866,7 +4236,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
+#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -3906,50 +4276,15 @@ msgid "Only executable for members"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:63
-msgid "Replace user configuration on startup"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:67
-msgid "Place icon on members desktop"
-msgstr ""
-
-#: plugins/admin/applications/generic.tpl:70
-msgid "Place entry in members startmenu"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
+msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
+#: plugins/admin/applications/generic.tpl:67
+msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
+#: plugins/admin/applications/generic.tpl:70
+msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
@@ -3958,6 +4293,25 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:38
+msgid "Display applications matching"
+msgstr ""
+
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Regular expression for matching application names"
+msgstr ""
+
 #: plugins/admin/applications/main.inc:38
 #: plugins/admin/applications/main.inc:40
 msgid "Application management"
@@ -4006,25 +4360,6 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr ""
-
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -4034,6 +4369,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 +4382,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 ""
 
@@ -4070,6 +4407,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:7
+#: plugins/gofon/conference/remove.tpl:7
 msgid ""
 "This includes <b>all</b> accounts, systems, etc. in this subtree. Please "
 "double check if your really want to do this since there is no way for GOsa "
@@ -4077,12 +4415,32 @@ 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 "
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr ""
+
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr ""
+
 #: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
 msgid "Department management"
 msgstr ""
@@ -4115,11 +4473,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 ""
 
@@ -4147,18 +4507,6 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr ""
-
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr ""
-
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr ""
-
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4195,36 +4543,42 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: 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_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -4323,114 +4677,6 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr ""
-
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr ""
@@ -4469,40 +4715,66 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:42
-msgid "Select action to execute for this server"
+#: plugins/admin/systems/class_servService.inc:240
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/server.tpl:42
+msgid "Select action to execute for this server"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -4573,14 +4845,18 @@ msgstr ""
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:219
+#: plugins/admin/systems/class_terminalGeneric.inc:237
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_terminalGeneric.inc:241
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
@@ -4593,6 +4869,70 @@ msgstr ""
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr ""
+
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr ""
@@ -4756,103 +5096,32 @@ 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 ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4873,70 +5142,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:104
-msgid "Logging DB user"
-msgstr ""
-
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr ""
-
 #: plugins/admin/systems/class_servDB.inc:131
 #: plugins/admin/systems/class_servDB.inc:147
 #: plugins/admin/systems/class_servDB.inc:153
@@ -4955,99 +5160,77 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/servdb.tpl:104
+msgid "Logging DB user"
 msgstr ""
 
 #: plugins/admin/systems/class_servKolab.inc:112
@@ -5116,6 +5299,82 @@ msgstr ""
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Specific Phone settings"
 msgstr ""
@@ -5192,16 +5451,108 @@ msgstr ""
 msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr ""
+
+#: plugins/admin/systems/remove.tpl:7
 msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr ""
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:4
@@ -5267,10 +5618,6 @@ msgstr ""
 msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/service.tpl:94
-msgid "Resolution"
-msgstr ""
-
 #: plugins/admin/systems/service.tpl:96
 msgid "Choose screen resolution used in graphic mode"
 msgstr ""
@@ -5367,14 +5714,16 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/component.tpl:6
@@ -5546,82 +5895,60 @@ 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."
-msgstr ""
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
+#: plugins/admin/systems/class_servNfs.inc:115
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
+#: plugins/admin/systems/class_servNfs.inc:119
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
+#: plugins/admin/systems/class_servNfs.inc:123
+msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -5692,6 +6019,17 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
@@ -5801,12 +6139,73 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
+msgstr ""
+
 #: plugins/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
 msgstr ""
@@ -5818,7 +6217,7 @@ msgid "Phone numbers"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:137
+#: plugins/admin/ogroups/phonequeue.tpl:96
 msgid "Generic queue Settings"
 msgstr ""
 
@@ -5852,239 +6251,194 @@ msgstr ""
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:91
-msgid "Announce holdtime"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:103
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:109
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:115
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:121
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:127
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:135
-msgid "Queue sound file setup"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:99
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:149
+#: plugins/admin/ogroups/phonequeue.tpl:108
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:157
+#: plugins/admin/ogroups/phonequeue.tpl:116
 msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:165
+#: plugins/admin/ogroups/phonequeue.tpl:124
 msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:173
+#: plugins/admin/ogroups/phonequeue.tpl:132
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:181
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:189
+#: plugins/admin/ogroups/phonequeue.tpl:148
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:197
+#: plugins/admin/ogroups/phonequeue.tpl:156
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:205
+#: plugins/admin/ogroups/phonequeue.tpl:164
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:213
+#: plugins/admin/ogroups/phonequeue.tpl:172
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:221
+#: plugins/admin/ogroups/phonequeue.tpl:180
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid "Remove the phone queue from this Account"
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:86
-msgid "Create phone queue"
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:86
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "Uruguai"
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "No"
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "Yes"
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
+#: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:80
 msgid "round robin"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:81
 msgid "least recently called"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
+#: plugins/admin/ogroups/class_phonequeue.inc:82
 msgid "fewest completed calls"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
+#: plugins/admin/ogroups/class_phonequeue.inc:83
 msgid "random"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:141
+#: plugins/admin/ogroups/class_phonequeue.inc:84
 msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:180
-msgid "Timeout must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:183
-msgid "Retry must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:186
-msgid "Max queue length must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:189
-msgid "Announce frequency must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:192
-msgid "There must be least one queue number defined."
+#: plugins/admin/ogroups/class_phonequeue.inc:110
+msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:215
-#: plugins/admin/ogroups/class_phonequeue.inc:551
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
-#, php-format
+#: plugins/admin/ogroups/class_phonequeue.inc:111
 msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:225
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
-#, php-format
-msgid "Can't select database %s on %s."
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:252
-#: plugins/admin/ogroups/class_phonequeue.inc:448
-#: plugins/admin/ogroups/class_phonequeue.inc:596
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:477
-#: plugins/admin/ogroups/class_phonequeue.inc:479
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: 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/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/admin/ogroups/class_phonequeue.inc:160
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/admin/ogroups/class_phonequeue.inc:198
+msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
+#: plugins/admin/ogroups/class_phonequeue.inc:201
+msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
+#: plugins/admin/ogroups/class_phonequeue.inc:204
+msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/admin/ogroups/class_phonequeue.inc:207
+msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/admin/ogroups/class_phonequeue.inc:210
+msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/admin/ogroups/class_phonequeue.inc:233
+#: plugins/admin/ogroups/class_phonequeue.inc:596
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:71
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/admin/ogroups/class_phonequeue.inc:243
+#: plugins/admin/ogroups/class_phonequeue.inc:606
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:78
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:262
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#, php-format
+msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: 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/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/admin/ogroups/class_phonequeue.inc:507
+#: plugins/admin/ogroups/class_phonequeue.inc:509
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1008
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
@@ -6183,12 +6537,24 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:239
@@ -6213,7 +6579,7 @@ 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
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:781
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -6230,142 +6596,151 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Phone PIN"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:47
-msgid "Forward calls to"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:49
-#: plugins/gofon/phoneaccount/generic.tpl:51
-msgid "Phone number"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:51
-msgid "Timeout (s)"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:65
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "Phone macro"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:73
-msgid "Refresh"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:74
-msgid "Complete"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:482
 msgid "Error while performing query "
 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/phoneaccount/class_phoneAccount.inc:496
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:616
+msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
-msgid "This account has no phone extensions."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:518
+msgid ""
+"The macro you selected, is no longer available for you, please choose "
+"another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:626
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:630
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:631
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:634
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:647
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:673
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:767
 #, php-format
 msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 #, php-format
 msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 #, php-format
 msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
-#, php-format
-msgid "The number '%s' is no valid phone number!"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:940
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:975
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+#: plugins/gofon/phoneaccount/generic.tpl:37
+msgid "Set voicemail password"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/phoneaccount/generic.tpl:52
+#: plugins/gofon/phoneaccount/generic.tpl:53
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/phoneaccount/generic.tpl:60
+msgid "Refresh"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Complete"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
 msgstr ""
 
 #: plugins/gofon/reports/class_fonreport.inc:6
@@ -6400,6 +6775,137 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+msgid "Please enter a PIN."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+msgid "Please enter a name for the conference."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+msgid "Only numeric chars are allowed in Number field."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+msgid "Only numbers are allowed in Lifetime."
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Regular expression for        matching user names"
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+msgid "Conference management"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:13
+msgid "Conference name"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:18
+msgid "Name of conference to create"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:24
+#: plugins/gofon/conference/generic.tpl:35
+msgid "Choose subtree to place conference in"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:62
+msgid "Lifetime (in days)"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:70
+msgid "Phone number"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:99
+msgid "Preset PIN"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+msgid "PIN"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:113
+msgid "Record conference"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:121
+msgid "Sound file format"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:138
+msgid "Play music on hold"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:144
+msgid "Activate session menu"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:150
+msgid "Announce users joining or leaving the conference"
+msgstr ""
+
+#: plugins/gofon/conference/generic.tpl:156
+msgid "Count users"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Create new conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "New conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+msgid "This table displays all available conference rooms."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
+msgid "Name - Number"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+msgid "Owner"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:360
+msgid "Conference"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr ""
@@ -6607,53 +7113,152 @@ msgid ""
 "server settings in the mail tab."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_mail-methods-cyrus.inc:52
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:115
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:131
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:181 include/class_plugin.inc:426
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"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_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: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:131
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/functions_helpviewer.inc:335
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_ldap.inc:438
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_ldap.inc:671
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_ldap.inc:684
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_ldap.inc:700
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_plugin.inc:180
@@ -6670,46 +7275,12 @@ msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:426 include/class_password-methods.inc:181
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-
 #: include/class_plugin.inc:454
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-
-#: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-
-#: include/class_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/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -7097,71 +7668,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"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-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 ""
@@ -7180,10 +7686,6 @@ msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
@@ -7196,6 +7698,10 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7203,26 +7709,6 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: html/main.php:112
-msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
-msgstr ""
-
-#: html/main.php:155
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-
-#: html/main.php:284
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:313
-msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
-msgstr ""
-
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7264,44 +7750,24 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: html/main.php:112
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
+#: html/main.php:155
+msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: html/main.php:284
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: html/main.php:313
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
+"Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -7356,6 +7822,46 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"