Modified Translation Strings.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 2746fe04df3d2f4624f548dc39effa533fa07236..05df6665a48f942633847e6e5a293f12eb1a3962 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,17 +6,17 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:42
+#: contrib/gosa.conf:44
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:57 contrib/gosa.conf:68 contrib/gosa.conf:76
-#: contrib/gosa.conf:82 contrib/gosa.conf:88 contrib/gosa.conf:96
-#: contrib/gosa.conf:105 contrib/gosa.conf:113 contrib/gosa.conf:118
-#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
-#: contrib/gosa.conf:138 plugins/personal/mail/generic.tpl:4
-#: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
-#: plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:59 contrib/gosa.conf:71 contrib/gosa.conf:80
+#: contrib/gosa.conf:86 contrib/gosa.conf:91 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:114 contrib/gosa.conf:122
+#: contrib/gosa.conf:127 contrib/gosa.conf:132 contrib/gosa.conf:137
+#: contrib/gosa.conf:142 contrib/gosa.conf:147
+#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
+#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
@@ -24,43 +24,49 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:58
+#: contrib/gosa.conf:60
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:59 contrib/gosa.conf:70
+#: contrib/gosa.conf:61 contrib/gosa.conf:72
+#: plugins/personal/environment/class_environment.inc:12
+#: plugins/admin/users/class_userManagement.inc:712
+msgid "Environment"
+msgstr ""
+
+#: contrib/gosa.conf:62 contrib/gosa.conf:74
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:63 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:720
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:64 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:65 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:718
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
+#: contrib/gosa.conf:66 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
@@ -68,7 +74,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:716
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -79,239 +85,256 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:64 contrib/gosa.conf:72 contrib/gosa.conf:78
-#: contrib/gosa.conf:84 contrib/gosa.conf:92 contrib/gosa.conf:101
-#: contrib/gosa.conf:109 contrib/gosa.conf:114 contrib/gosa.conf:119
-#: contrib/gosa.conf:124 contrib/gosa.conf:129 contrib/gosa.conf:134
-#: contrib/gosa.conf:139
+#: contrib/gosa.conf:67 contrib/gosa.conf:76 contrib/gosa.conf:82
+#: contrib/gosa.conf:87 contrib/gosa.conf:93 contrib/gosa.conf:101
+#: contrib/gosa.conf:110 contrib/gosa.conf:118 contrib/gosa.conf:123
+#: contrib/gosa.conf:128 contrib/gosa.conf:133 contrib/gosa.conf:138
+#: contrib/gosa.conf:143 contrib/gosa.conf:148
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:73
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:75
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:81 plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:517
+#: contrib/gosa.conf:92 plugins/gofon/phoneaccount/class_phoneAccount.inc:636
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:89 contrib/gosa.conf:106
+#: contrib/gosa.conf:98 contrib/gosa.conf:115
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:90 contrib/gosa.conf:107
+#: contrib/gosa.conf:99 contrib/gosa.conf:116
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
+#: contrib/gosa.conf:100 contrib/gosa.conf:109 contrib/gosa.conf:117
 msgid "Monitoring"
 msgstr ""
 
-#: contrib/gosa.conf:97
+#: contrib/gosa.conf:106
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:107 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:160 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
+#: contrib/gosa.conf:161 plugins/personal/mail/generic.tpl:112
+#: plugins/personal/environment/logonManagement.tpl:53
+#: plugins/personal/environment/logonManagement.tpl:57
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:153
+#: contrib/gosa.conf:162
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:169
+#: contrib/gosa.conf:178
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:160
+#: contrib/gosa.conf:195 plugins/admin/ogroups/class_phonequeue.inc:160
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:196
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:197
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:198
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:199
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:191
+#: contrib/gosa.conf:200
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:192
+#: contrib/gosa.conf:201
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-msgid "This does something"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
+#: plugins/personal/mail/mail_locals.tpl: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/systems/selectUserToPrinterDialog.tpl:35
+#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:28
+msgid "Filters"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
+#: 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/systems/selectUserToPrinterDialog.tpl:44
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
+#: 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/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
+#: 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/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
+#: 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:102
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/samba/samba3.tpl:287
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/environment/environment.tpl:114
+#: plugins/personal/environment/environment.tpl:169
+#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: 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/systems/servservice.tpl:21
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
+#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:13
+msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
+#: 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/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialog.tpl:76
+#: plugins/personal/environment/selectPrinterDialog.tpl:75
+#: plugins/personal/environment/logonManagement.tpl:78
+#: plugins/personal/environment/hotplugDialogNew.tpl:30
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: 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:617
+#: 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/systems/servnfs.tpl:86
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:263
+#: plugins/gofon/conference/remove.tpl:17
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
@@ -353,42 +376,14 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:135
-#: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/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/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
-#: 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
-msgid "Add"
-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
@@ -454,7 +449,8 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/environment/environment.tpl:57
 msgid "MB"
 msgstr ""
 
@@ -492,14 +488,14 @@ 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/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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/users/class_userManagement.inc:615
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -510,52 +506,10 @@ msgstr ""
 msgid "Finish"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:613
-#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:529
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:263
-#: plugins/gofon/conference/remove.tpl:17
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
 #: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/environment/main.inc:114
 #: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:111
 msgid "Click the 'Edit' button below to change informations in this dialog"
@@ -564,9 +518,13 @@ msgstr ""
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
 #: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
 #: plugins/personal/connectivity/main.inc:127
+#: plugins/personal/environment/environment.tpl:116
+#: plugins/personal/environment/main.inc:115
 #: plugins/gofax/faxaccount/generic.tpl:90
 #: plugins/gofax/faxaccount/generic.tpl:96
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/printer.tpl:56
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr ""
@@ -575,83 +533,149 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:28
-msgid "Filters"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/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/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl: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/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/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/login.tpl:35 ihtml/themes/default/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
-msgid "Password"
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:664
 msgid "Change password"
 msgstr ""
 
@@ -703,22 +727,34 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
 #: ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr ""
 
+#: 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/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
+msgid "Password"
+msgstr ""
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -757,17 +793,55 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:6
@@ -852,68 +926,22 @@ msgstr ""
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:19
+#: plugins/personal/posix/posix_shadow.tpl:14
 #: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:225
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/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:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
 msgstr ""
 
 #: plugins/personal/posix/main.inc:131
@@ -926,7 +954,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Group of user"
 msgstr ""
 
@@ -936,7 +964,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:184
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:208
 msgid "automatic"
 msgstr ""
 
@@ -944,54 +972,54 @@ msgstr ""
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:239
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:240
+#: plugins/personal/posix/class_posixAccount.inc:241
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
-"remove the samba account first."
+"remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:243
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:431
+#: plugins/personal/posix/class_posixAccount.inc:432
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:434
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:436
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1002,7 +1030,7 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1013,7 +1041,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1024,7 +1052,7 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:352
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
@@ -1035,7 +1063,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1046,7 +1074,7 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1057,7 +1085,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1068,7 +1096,7 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1079,7 +1107,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:462
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:353
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
@@ -1090,7 +1118,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1101,7 +1129,7 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1112,7 +1140,7 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/posix/class_posixAccount.inc:464
 #: plugins/personal/samba/class_sambaAccount.inc:354
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
@@ -1123,7 +1151,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 #: plugins/personal/samba/class_sambaAccount.inc:450
 #: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
@@ -1132,81 +1160,81 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:543
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:710
+#: plugins/personal/posix/class_posixAccount.inc:711
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:862
+#: plugins/personal/posix/class_posixAccount.inc:866
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:865
+#: plugins/personal/posix/class_posixAccount.inc:869
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:873
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:876
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:884
 #: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/personal/posix/class_posixAccount.inc:887
 #: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:895
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:896
+#: plugins/personal/posix/class_posixAccount.inc:900
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:905
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:911
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:914
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1031
 #: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
@@ -1543,7 +1571,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:953
 #: plugins/addons/addressbook/class_addressbook.inc:537
 #: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
+#: plugins/admin/departments/class_departmentGeneric.inc:166
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
@@ -1558,13 +1586,13 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:936
 #: plugins/addons/addressbook/class_addressbook.inc:545
 #: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
+#: plugins/admin/departments/class_departmentGeneric.inc:169
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:939
 #: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -1582,13 +1610,6 @@ msgstr ""
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
@@ -1603,11 +1624,14 @@ msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/environment/logonManagement.tpl:10
+#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
+#: plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
 
@@ -1650,9 +1674,9 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:24
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
@@ -1715,7 +1739,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -1758,7 +1782,7 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:247
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/printer.tpl:14
+#: plugins/admin/systems/printer.tpl:44
 msgid "Location"
 msgstr ""
 
@@ -1821,15 +1845,31 @@ 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
+#: plugins/admin/systems/servnfs.tpl:85
 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 ""
@@ -1838,6 +1878,7 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
@@ -1856,41 +1897,54 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:53
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:16
@@ -1913,6 +1967,58 @@ msgstr ""
 msgid "per"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr ""
+
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr ""
@@ -1928,263 +2034,578 @@ msgid ""
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
+msgid "KB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:78
+msgid "GB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "hour"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "day"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "week"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
+msgid "month"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:130
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
+msgid "Numerical value for Quota Setting is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:3
+msgid "The environment extension is currently disabled."
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:6
+msgid "Environment managment settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:9
+msgid "Profiles"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:10
+msgid "Profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:17
+msgid "Use profile managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:24
+msgid "Profile server managment"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:27
+msgid "Profil server"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:39
+msgid "Use local caching"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:62
+#: plugins/admin/systems/service.tpl:94
+msgid "Resolution"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:76
+msgid "Resolution changeable on runtime"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/environment.tpl:86
+msgid "Kiosk profile"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:83
+msgid "Kiosk profile settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:99
+msgid "Profile management"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:104
+msgid "Logon scripts"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/logonManagement.tpl:5
+msgid "Logon script management"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:122
+msgid "Attach share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:142
+msgid "Hotplug devices"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:143
+msgid "Hotplug device settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:153
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
+#: plugins/personal/environment/environment.tpl:154
+msgid "Existing"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: 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/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/personal/environment/environment.tpl:161
+msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
+#: plugins/personal/environment/environment.tpl:171
+msgid "Admin Toggle"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
+#: plugins/personal/environment/class_hotplugDialog.inc:109
+msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
+#: plugins/personal/environment/class_hotplugDialog.inc:112
+msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
+#: plugins/personal/environment/class_hotplugDialog.inc:115
+msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
+#: plugins/personal/environment/class_hotplugDialog.inc:126
+msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
+msgid "Please select a printer or press cancel."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
+#: plugins/personal/environment/hotplugDialog.tpl:1
+msgid "Select hotplug entry"
 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/environment/hotplugDialog.tpl:5
+msgid "Hotplug management"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:24
+#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
+msgid "Information"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
+#: plugins/personal/environment/hotplugDialog.tpl:28
+msgid "This menu allows you to select an existing hotplug configuration."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
+#: plugins/personal/environment/hotplugDialog.tpl:40
+msgid "Display hotplugs of department"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
+#: plugins/personal/environment/hotplugDialog.tpl:43
+msgid "Choose the department the search will be based    on"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
+#: plugins/personal/environment/hotplugDialog.tpl:57
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+#: plugins/gofon/conference/headpage.tpl:34
+msgid "Display users matching"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
+#: plugins/personal/environment/hotplugDialog.tpl:62
+msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
+#: plugins/personal/environment/hotplugDialog.tpl:75
+#: plugins/personal/environment/selectPrinterDialog.tpl:74
+#: plugins/personal/environment/logonManagement.tpl:77
+msgid "Use"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
+#: plugins/personal/environment/class_environment.inc:197
+#: plugins/personal/environment/class_environment.inc:229
+msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/personal/environment/class_environment.inc:198
+#: plugins/personal/environment/class_environment.inc:230
+msgid ""
+"This server has environment extension enabled. You can disable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/personal/environment/class_environment.inc:202
+#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:234
+#: plugins/personal/environment/class_environment.inc:239
+msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#: plugins/personal/environment/class_environment.inc:203
+#: plugins/personal/environment/class_environment.inc:235
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
+"This server has environment extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#: plugins/personal/environment/class_environment.inc:208
+#: plugins/personal/environment/class_environment.inc:240
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
+"This server has environment extension disabled. You have to setup a posix "
+"account before you can enable this feature."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/personal/environment/class_environment.inc:615
+msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/environment/class_environment.inc:622
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/personal/environment/class_environment.inc:959
+msgid "Admin"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
+msgid "Select printer entry"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/environment/selectPrinterDialog.tpl:5
+#: plugins/personal/environment/selectPrinterDialog.tpl:10
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:5
+msgid "Select printer to add"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: 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/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/environment/selectPrinterDialog.tpl:41
+msgid "Display printers of department"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/environment/selectPrinterDialog.tpl:58
+msgid "Display printers matching"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/personal/environment/selectPrinterDialog.tpl:63
+msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/personal/environment/logonManagement.tpl:1
+msgid "Logon management"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/personal/environment/logonManagement.tpl:8
+msgid "Logon script settings"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
+#: plugins/personal/environment/logonManagement.tpl:17
+#: plugins/personal/environment/hotplugDialogNew.tpl:14
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:51
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: plugins/personal/environment/logonManagement.tpl:24
+msgid "Priority"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/personal/environment/logonManagement.tpl:35
+msgid "Logon script flags"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/personal/environment/logonManagement.tpl:40
+msgid "Last script"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/personal/environment/logonManagement.tpl:48
+msgid "Overloadable"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/personal/environment/logonManagement.tpl:65
+msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:80
+#, php-format
+msgid "Can't open '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+#: plugins/personal/environment/hotplugDialogNew.tpl:5
+msgid "Create new hotplug entry"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
+#: plugins/personal/environment/hotplugDialogNew.tpl:21
+msgid "ID"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
+#: plugins/personal/environment/hotplugDialogNew.tpl:29
+msgid "save"
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
+msgid "Kiosk profile management"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
+#: plugins/personal/environment/kioskManagement.tpl:12
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
+#: plugins/personal/environment/kioskManagement.tpl:22
+msgid "Close"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
+#: plugins/personal/environment/class_logonManagementDialog.inc:93
+msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
+msgid "Specified description contains invalid characters."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
+#: 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/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: 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/generic.tpl:8
@@ -2201,6 +2622,7 @@ 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 ""
@@ -2209,18 +2631,6 @@ msgstr ""
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36 plugins/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"
 msgstr ""
@@ -2229,18 +2639,6 @@ msgstr ""
 msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-#: plugins/gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr ""
-
 #: plugins/gofax/blocklists/generic.tpl:69
 msgid "Numbers can also contain wild cards."
 msgstr ""
@@ -2264,7 +2662,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:652
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2276,7 +2674,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:652
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2289,7 +2687,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:653
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2301,7 +2699,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:653
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2313,7 +2711,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2324,7 +2722,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2344,7 +2742,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2356,7 +2754,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2368,7 +2766,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2380,7 +2778,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:663
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2391,14 +2789,14 @@ msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:663
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/admin/users/class_userManagement.inc:665
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2410,7 +2808,7 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/admin/users/class_userManagement.inc:665
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr ""
@@ -2422,7 +2820,7 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/users/class_userManagement.inc:674
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2449,7 +2847,7 @@ msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/admin/departments/class_departmentGeneric.inc:154
 msgid "Required field 'Name' is not set."
 msgstr ""
 
@@ -2486,44 +2884,9 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
 #: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
 #: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
-msgid ""
-"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
-"abort."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
+msgid ""
+"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
+"abort."
 msgstr ""
 
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
@@ -2630,8 +2993,8 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1276
 msgid "Apply"
 msgstr ""
 
@@ -2696,55 +3059,6 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2779,6 +3093,12 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/systems/class_printGeneric.inc:482
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2793,12 +3113,60 @@ msgstr ""
 msgid "Receiver"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr ""
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr ""
@@ -2828,10 +3196,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -2905,6 +3269,13 @@ 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 ""
@@ -2944,13 +3315,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr ""
@@ -3039,6 +3403,43 @@ 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: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"
@@ -3102,11 +3503,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr ""
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
@@ -3119,38 +3515,6 @@ 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 ""
@@ -3174,97 +3538,37 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:24
-#: plugins/addons/ldapmanager/contentexport.tpl:39
-msgid "Choose the department you want to Export"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentexport.tpl:36
-msgid "Export IVBB LDIF for"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentexport.tpl:55
-msgid "Export successful"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-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 ""
-
-#: plugins/addons/ldapmanager/class_export.inc:35
-msgid "You've no permission to do LDAP exports."
-msgstr ""
-
-#: plugins/addons/ldapmanager/class_export.inc:80
-msgid "Error while exporting the requested entries!"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:6
-msgid "System logs"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:36
-msgid "No LOG servers defined!"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:48
-#: plugins/addons/logview/class_logview.inc:138
-msgid "Can't select log database for log generation!"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:57
-#: plugins/addons/logview/class_logview.inc:71
-#: plugins/addons/logview/class_logview.inc:210
-msgid "Query for log database failed!"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:81
-msgid "one hour"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:81
-msgid "6 hours"
+#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:39
+msgid "Choose the department you want to Export"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:82
-msgid "12 hours"
+#: plugins/addons/ldapmanager/contentexport.tpl:36
+msgid "Export IVBB LDIF for"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:82
-msgid "24 hours"
+#: plugins/addons/ldapmanager/contentexport.tpl:55
+msgid "Export successful"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:83
-msgid "2 days"
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the complete LDAP database to a file"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:83
-msgid "one week"
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the LDAP Export "
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:84
-msgid "2 weeks"
+#: plugins/addons/ldapmanager/class_export.inc:7
+msgid "CSV import"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:84
-msgid "one month"
+#: plugins/addons/ldapmanager/class_export.inc:35
+msgid "You've no permission to do LDAP exports."
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:135
-msgid "Can't connect to log database, no logs can be shown!"
+#: plugins/addons/ldapmanager/class_export.inc:80
+msgid "Error while exporting the requested entries!"
 msgstr ""
 
 #: plugins/addons/logview/contents.tpl:11
@@ -3303,49 +3607,70 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/addons/logview/class_logview.inc:6
+msgid "System logs"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
+#: plugins/addons/logview/class_logview.inc:36
+msgid "No LOG servers defined!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
+#: plugins/addons/logview/class_logview.inc:48
+#: plugins/addons/logview/class_logview.inc:138
+msgid "Can't select log database for log generation!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
+#: plugins/addons/logview/class_logview.inc:57
+#: plugins/addons/logview/class_logview.inc:71
+#: plugins/addons/logview/class_logview.inc:210
+msgid "Query for log database failed!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
+#: plugins/addons/logview/class_logview.inc:81
+msgid "one hour"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
+#: plugins/addons/logview/class_logview.inc:81
+msgid "6 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
+#: plugins/addons/logview/class_logview.inc:82
+msgid "12 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
+#: plugins/addons/logview/class_logview.inc:82
+msgid "24 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/addons/logview/class_logview.inc:83
+msgid "2 days"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
+#: plugins/addons/logview/class_logview.inc:83
+msgid "one week"
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:84
+msgid "2 weeks"
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:84
+msgid "one month"
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:135
+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"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
 
 #: plugins/admin/groups/mail.tpl:11
@@ -3372,15 +3697,10 @@ msgstr ""
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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
@@ -3406,11 +3726,6 @@ msgstr ""
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "New"
-msgstr ""
-
 #: plugins/admin/groups/class_groupManagement.inc:361
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
@@ -3429,7 +3744,7 @@ msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:710
 msgid "Posix"
 msgstr ""
 
@@ -3446,7 +3761,7 @@ msgid "Groupname"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:673
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3461,59 +3776,65 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 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."
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:153
-msgid "read"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:154
-msgid "post"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:155
-msgid "external post"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:156
-msgid "append"
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:157
-msgid "write"
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:179
-msgid "This 'dn' has no valid mail extensions."
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:244
-msgid "You're trying to add an invalid email address "
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:245
-msgid "to the list of forwarders."
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:613
-msgid "Please enter a valid email addres in 'Primary address' field."
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:646
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:650
-msgid "Please select a valid mail server."
+#: 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/acl.tpl:4
@@ -3524,47 +3845,53 @@ msgstr ""
 msgid "Apply this acl only for users own entries"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
+#: plugins/admin/groups/class_groupMail.inc:153
+msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
+#: plugins/admin/groups/class_groupMail.inc:154
+msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
+#: plugins/admin/groups/class_groupMail.inc:155
+msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
+#: plugins/admin/groups/class_groupMail.inc:156
+msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
+#: plugins/admin/groups/class_groupMail.inc:157
+msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
+#: plugins/admin/groups/class_groupMail.inc:179
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-#: plugins/gofon/conference/headpage.tpl:34
-msgid "Display users matching"
+#: plugins/admin/groups/class_groupMail.inc:244
+msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
+#: plugins/admin/groups/class_groupMail.inc:245
+msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
+#: 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/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
@@ -3603,16 +3930,37 @@ msgstr ""
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:66
-msgid "Members are in a phone pickup group"
+#: plugins/admin/groups/generic.tpl:66
+msgid "Members are in a phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:81
+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: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/generic.tpl:81
-msgid "Group members"
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:61
@@ -3652,47 +4000,81 @@ msgstr ""
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+"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/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:981
-#: plugins/admin/systems/class_systemManagement.inc:699
-msgid "Template"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: 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 "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
+#: plugins/admin/systems/printer.tpl:75
 msgid "Users"
 msgstr ""
 
@@ -3720,29 +4102,27 @@ msgstr ""
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+#: plugins/admin/users/class_userManagement.inc:656
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+#: plugins/admin/users/class_userManagement.inc:656
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:657
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:657
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:664
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:672
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
@@ -3751,118 +4131,108 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:677
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:708
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:709
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:711
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:713
+msgid "Edit environment properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:715
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:719
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:721
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:722
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:778
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:785
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/users/class_userManagement.inc:993
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 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"
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: 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/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/applications/headpage.tpl:38
+msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Regular expression for matching application names"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -3872,7 +4242,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -3964,28 +4334,33 @@ 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"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
 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."
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:247
@@ -4007,28 +4382,23 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
-msgid "This 'dn' is no application."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:159
-msgid "The specified picture has not been uploaded correctly."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:240
-msgid "You have no permissions to create a application on this 'Base'."
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:245
-msgid "Required field 'Name' is not filled."
+#: 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/applications/class_applicationGeneric.inc:248
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:257
-msgid "There's already an application with this 'Name'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
@@ -4053,7 +4423,6 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:122
 msgid "Choose subtree to place department in"
 msgstr ""
@@ -4078,6 +4447,10 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
+#: plugins/admin/departments/tabs_department.inc:30
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:7
 #: plugins/gofon/conference/remove.tpl:7
 msgid ""
@@ -4094,27 +4467,29 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
 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."
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/admin/departments/class_departmentGeneric.inc:149
+msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentGeneric.inc:157
+msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:163
+msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
@@ -4158,25 +4533,16 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -4215,46 +4581,36 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 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'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 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"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -4353,40 +4709,112 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc: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:254
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:368
+#: 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/servservice.tpl:11
-msgid "Nfs Export"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:26
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:83
@@ -4427,47 +4855,10 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr ""
-
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr ""
-
 #: plugins/admin/systems/server.tpl:42
 msgid "Select action to execute for this server"
 msgstr ""
@@ -4476,68 +4867,52 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
+#: plugins/admin/systems/class_servService.inc:240
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
+#: plugins/admin/systems/printer.tpl:41
+msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/printer.tpl:48
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
+#: plugins/admin/systems/printer.tpl:56
+msgid "PPD"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/printer.tpl:66
+msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
+#: plugins/admin/systems/printer.tpl:74
+msgid "Following objects are assigned as user."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/printer.tpl:91
+msgid "Following objects are assigned as admin."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/printer.tpl:92
+msgid "Admins"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -4608,11 +4983,11 @@ msgstr ""
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:219
+#: plugins/admin/systems/class_terminalGeneric.inc:237
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_terminalGeneric.inc:241
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
@@ -4648,18 +5023,6 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr ""
-
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr ""
@@ -4803,13 +5166,6 @@ 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:917
 msgid "New terminal"
 msgstr ""
@@ -4826,12 +5182,80 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4852,14 +5276,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr ""
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -4920,149 +5336,31 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Add Kolab service"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:149
+#: plugins/admin/systems/class_servDB.inc:137
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
-msgstr ""
-
-#: plugins/admin/systems/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"
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
-
-#: plugins/admin/systems/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+
+#: plugins/admin/systems/class_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
@@ -5148,6 +5446,136 @@ msgstr ""
 msgid "User name of which terminal(s) are shown"
 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."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:153
+#: plugins/admin/systems/class_printGeneric.inc:156
+msgid "Remove printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:154
+msgid ""
+"This workstation has printer extension enabled. You can disable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:157
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:161
+#: plugins/admin/systems/class_printGeneric.inc:164
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:162
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:165
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:175
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:293
+msgid "Undefined"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:358
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:477
+#: plugins/admin/systems/class_printGeneric.inc:479
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr ""
+
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr ""
@@ -5211,10 +5639,6 @@ msgstr ""
 msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
-#: plugins/admin/systems/service.tpl:94
-msgid "Resolution"
-msgstr ""
-
 #: plugins/admin/systems/service.tpl:96
 msgid "Choose screen resolution used in graphic mode"
 msgstr ""
@@ -5311,18 +5735,6 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
 #: plugins/admin/systems/class_componentGeneric.inc:113
 #: plugins/admin/systems/class_phoneGeneric.inc:276
 msgid "The required field 'MAC-address' is not set."
@@ -5457,6 +5869,22 @@ msgstr ""
 msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
 
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:41
+msgid "Charset"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:75
+msgid "Option"
+msgstr ""
+
 #: plugins/admin/systems/class_phoneGeneric.inc:102
 msgid "This 'dn' has no phone features."
 msgstr ""
@@ -5502,6 +5930,30 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
+#: plugins/admin/systems/class_servNfs.inc:101
+msgid "Please specify a valid path for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:107
+msgid "Please specify a valid name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:110
+msgid "Please specify a name for your setup."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:115
+msgid "Description contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:119
+msgid "Path contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:123
+msgid "Option contains invalid characters."
+msgstr ""
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Specific Phone settings"
 msgstr ""
@@ -5578,6 +6030,85 @@ msgstr ""
 msgid "MSN"
 msgstr ""
 
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
+msgid "Select entry"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
+msgid "Select user/group to add"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+msgid ""
+"This menu allows you to select one or multiple users or groups to add them "
+"to the printer. \n"
+"\t\t\t\t\t\t\tHaving a great number of users, you may want to use the range "
+"selectors on top of this list."
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
+msgid "Display members of department"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+msgid "Display members matching"
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
+msgid "Regular expression for matching member names"
+msgstr ""
+
+#: plugins/admin/ogroups/headpage.tpl:24
+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/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr ""
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr ""
@@ -5634,35 +6165,79 @@ msgstr ""
 msgid "Select to see printers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Show printers"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Select to see phones"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+msgid "Regular expression for matching object names"
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Display objects matching"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-msgid "Regular expression for matching object names"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:95
@@ -5725,110 +6300,135 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:46
+msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "Create new object group"
+#: plugins/admin/ogroups/phonequeue.tpl:62
+msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Name of object groups"
+#: plugins/admin/ogroups/phonequeue.tpl:74
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: plugins/admin/ogroups/phonequeue.tpl:82
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
 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/ogroups/phonequeue.tpl:116
+msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
+#: plugins/admin/ogroups/phonequeue.tpl:124
+msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
+#: plugins/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
 msgstr ""
 
 #: plugins/admin/ogroups/mail.tpl:7
@@ -5917,9 +6517,10 @@ msgid "There must be least one queue number defined."
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:233
-#: plugins/admin/ogroups/class_phonequeue.inc:590
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:230
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
+#: plugins/admin/ogroups/class_phonequeue.inc:596
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:72
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:277
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1008
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
@@ -5930,269 +6531,201 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:243
-#: plugins/admin/ogroups/class_phonequeue.inc:600
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-#, php-format
-msgid "Can't select database %s on %s."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:270
-#: plugins/admin/ogroups/class_phonequeue.inc:473
-#: plugins/admin/ogroups/class_phonequeue.inc:635
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:502
-#: plugins/admin/ogroups/class_phonequeue.inc:504
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:997
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:383
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
-msgid "Generic queue Settings"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:18
-msgid "Down"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:46
-msgid "Timeout"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:62
-msgid "Strategy"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:116
-msgid "Welcome sound file"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:124
-msgid "Announce message"
+#: plugins/admin/ogroups/class_phonequeue.inc:606
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:288
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#, php-format
+msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
+#: plugins/admin/ogroups/class_phonequeue.inc:274
+#: plugins/admin/ogroups/class_phonequeue.inc:478
+#: plugins/admin/ogroups/class_phonequeue.inc:642
+#, php-format
+msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
+#: plugins/admin/ogroups/class_phonequeue.inc:507
+#: plugins/admin/ogroups/class_phonequeue.inc:509
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1121
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Voicemail PIN"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
-msgid "'Thank you' message"
+#: plugins/gofon/phoneaccount/generic.tpl:37
+msgid "Set phone password"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
+#: plugins/gofon/phoneaccount/generic.tpl:46
+msgid "Set voicemail password"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
+#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:62
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
-msgid "Less Than sound file"
+#: plugins/gofon/phoneaccount/generic.tpl:69
+msgid "Refresh"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
-msgid "Phone attributes "
+#: plugins/gofon/phoneaccount/generic.tpl:70
+msgid "Complete"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+msgid "no macro"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:134
+msgid "undefined"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+msgid ""
+"You are currently creating a new phone account, please specify a value for "
+"phone PIN and voice PIN."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:311
+msgid ""
+"The PIN attribute is missing in database entry. Please assign a valid phone "
+"PIN."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:318
+msgid ""
+"The voice PIN attribute is missing in database entry. Please assign a valid "
+"voice PIN."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:566
+msgid "Error while performing query "
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:580
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:722
+msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:93
-msgid "no macro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:597
+msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:110
-msgid "undefined"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
+msgid ""
+"The specified Voicemail PIN contains invalid characters, only numeric values "
+"are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
-msgid "Error while performing query "
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:609
+msgid "Phone PIN must be 4 characters long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:502
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:612
 msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+"The specified phone PIN contains invalid characters, only numeric values are "
+"allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
-msgid "This account has no phone extensions."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+msgid ""
+"The macro you selected, is no longer available for you, please choose "
+"another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:732
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:611
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:733
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:614
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:736
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:737
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:618
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:631
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:657
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:783
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:765
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:880
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:769
-#, php-format
-msgid "You need to specify a Phone PIN."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, php-format
-msgid "The given PIN is too short"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:783
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:887
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:927
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1051
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:962
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1086
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Phone PIN"
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:51
-#: plugins/gofon/phoneaccount/generic.tpl:52
-msgid "Phone macro"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-msgid "Refresh"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Complete"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr ""
+
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
 #: plugins/gofon/reports/class_fonreport.inc:6
@@ -6211,24 +6744,85 @@ msgstr ""
 msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr ""
+
+#: 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_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
@@ -6289,51 +6883,12 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr ""
-
-#: 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/headpage.tpl:6
-msgid "List of macros"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:239
@@ -6361,58 +6916,31 @@ msgstr ""
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-msgid "Macro"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/conference/headpage.tpl:35
+msgid "Regular expression for        matching user names"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:13
@@ -6423,6 +6951,7 @@ msgstr ""
 msgid "Name of conference to create"
 msgstr ""
 
+#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 msgid "Choose subtree to place conference in"
 msgstr ""
@@ -6476,12 +7005,20 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "Create new conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+msgid "New conference"
+msgstr ""
+
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 msgid "This table displays all available conference rooms."
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
-msgid "Name / nummer"
+msgid "Name - Number"
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
@@ -6492,21 +7029,6 @@ msgstr ""
 msgid "Conference"
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
-msgstr ""
-
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-
-#: plugins/gofon/conference/headpage.tpl:35
-msgid "Regular expression for        matching user names"
-msgstr ""
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:186
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
@@ -6690,22 +7212,22 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:991
+#: include/functions.inc:997
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1090
+#: include/functions.inc:1096
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1544
+#: include/functions.inc:1550
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1587
+#: include/functions.inc:1593
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -6765,20 +7287,6 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-
 #: include/class_plugin.inc:180
 msgid "This 'dn' has no account extensions."
 msgstr ""
@@ -6805,21 +7313,22 @@ msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 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."
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
+#: 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_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
 #: include/class_password-methods.inc:165
@@ -6832,6 +7341,35 @@ msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
+#: include/class_ppdManager.inc:57
+#, php-format
+msgid ""
+"Parsing PPD file %s faild - line too long. Trailing characters have been "
+"ignored"
+msgstr ""
+
+#: include/class_ppdManager.inc:78
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr ""
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
 #: include/class_password-methods-kerberos.inc:43
 msgid ""
 "Warning: Can't set kerberos password. Your PHP version has no kerberos "
@@ -6846,10 +7384,6 @@ msgstr ""
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
 #: include/class_ldap.inc:438
 #, php-format
 msgid ""
@@ -6898,16 +7432,6 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -7295,22 +7819,18 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
-
-#: html/helpviewer.php:85
-msgid "previous"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: html/helpviewer.php:89
-msgid "next"
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: html/helpviewer.php:141
-#, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 
 #: html/getfax.php:53
@@ -7325,10 +7845,6 @@ 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 ""
@@ -7356,6 +7872,24 @@ msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
 
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "next"
+msgstr ""
+
+#: html/helpviewer.php:141
+#, php-format
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgstr ""
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7420,6 +7954,23 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
@@ -7442,23 +7993,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl: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/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7495,22 +8029,6 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr ""
-
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -7522,18 +8040,20 @@ msgid ""
 "case by pressing the <i>Remove</i> button."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+msgid "Setup continued..."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
@@ -7717,12 +8237,18 @@ msgid ""
 "execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
 msgstr ""
 
 #: ihtml/themes/default/setup_step4.tpl:100
@@ -7731,3 +8257,11 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting. "
 "(But it could be a security risk)  "
 msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""