Fixed Translation Strings.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index ce4e150e2eae6e4dad994d448f717226d020b547..6ac28e60c557ca2af16262ee89e3c614e80fc333 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -1,203 +1,250 @@
-#: contrib/gosa.conf:4
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:89 contrib/gosa.conf:98
-#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:115
-#: contrib/gosa.conf:124 contrib/gosa.conf:140 contrib/gosa.conf:149
-#: contrib/gosa.conf:154 contrib/gosa.conf:159 contrib/gosa.conf:164
-#: contrib/gosa.conf:169 contrib/gosa.conf:174
+#: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
+#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
+#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
 #: 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/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/fai/faiVariable.tpl:4
+#: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/goMailServer.tpl:1
+#: plugins/admin/systems/goImapServer.tpl:1
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
+#: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
+#: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:81
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:90
+#: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:413
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/personal/environment/class_environment.inc:1252
+#: plugins/admin/groups/class_divListGroup.inc:149
+#: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:92
+#: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:401
-#: plugins/admin/users/class_userManagement.inc:739
-#: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
+#: plugins/admin/groups/class_divListGroup.inc:141
+#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:404
-#: plugins/admin/users/class_userManagement.inc:745
+#: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
+#: plugins/admin/groups/class_divListGroup.inc:143
+#: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:173
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:380
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:743
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:232
-#: plugins/personal/generic/generic.tpl:370
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:410
-#: plugins/admin/users/class_userManagement.inc:741
-#: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
+#: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:84 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:85 contrib/gosa.conf:94 contrib/gosa.conf:100
-#: contrib/gosa.conf:105 contrib/gosa.conf:111 contrib/gosa.conf:120
-#: contrib/gosa.conf:136 contrib/gosa.conf:145 contrib/gosa.conf:150
-#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
-#: contrib/gosa.conf:170 contrib/gosa.conf:175
-msgid "References"
-msgstr ""
-
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:44
+#: plugins/admin/mimetypes/generic.tpl:90
+#: plugins/admin/mimetypes/generic.tpl:131
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:93
+#: contrib/gosa.conf:101 include/class_tabs.inc:294
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:99 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:110 plugins/admin/systems/servdnseditzone.tpl:88
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: contrib/gosa.conf:115 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:497
+#: contrib/gosa.conf:122 contrib/gosa.conf:138
+#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/class_environment.inc:1269
+#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
+#: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:135 contrib/gosa.conf:144
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:70
+#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
+#: plugins/gofax/blocklists/generic.tpl:75
 #: 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/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:24
+#: ihtml/themes/default/MultiSelectWindow.tpl:64
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:125
-msgid "Databases"
-msgstr ""
-
-#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
-#: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/fai/faiPackage.tpl:29
-msgid "Repository"
+#: contrib/gosa.conf:130 contrib/gosa.conf:140
+msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:193
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:197 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -206,108 +253,113 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:205
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/admin/applications/generic.tpl:94
+#: plugins/addons/ldapmanager/contentimport.tpl:50
+#: plugins/addons/notifications/contents.tpl:52
+#: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:207
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:204
+#: contrib/gosa.conf:211
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:208 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:92
+#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:212 plugins/admin/fai/class_faiManagement.inc:756
-#: plugins/admin/fai/class_faiManagement.inc:757
+#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:216 plugins/admin/fai/class_faiManagement.inc:749
-#: plugins/admin/fai/class_faiManagement.inc:750
+#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:220 plugins/admin/fai/class_faiManagement.inc:770
-#: plugins/admin/fai/class_faiManagement.inc:771
+#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:224 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:228
+#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: plugins/admin/acl/class_divListACL.inc:49
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:258
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:277 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:278
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:279
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:280
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:281
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:282
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:283
 msgid "Italian"
 msgstr ""
 
+#: contrib/gosa.conf:284
+msgid "Polish"
+msgstr ""
+
 #: plugins/personal/mail/mail_locals.tpl:6
 #: plugins/admin/groups/mail_locals.tpl:6
 msgid "Select addresses to add"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: 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/addons/godfs/contents.tpl:31
 #: 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/groups/mail_locals.tpl:22
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/servRepository.tpl:36
@@ -315,25 +367,24 @@ msgstr ""
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/ogroups/headpage.tpl:29
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/fai/headpage.tpl:64 plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
 msgid "Filters"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
+#: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
 #: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:32
+#: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
@@ -358,42 +409,50 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:65
+#: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/connectivity/kolab.tpl:33
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
+#: plugins/personal/environment/environment.tpl:119
+#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
-#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:486
-#: plugins/admin/groups/generic.tpl:104
-#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:27
+#: plugins/admin/groups/class_groupMail.inc:540
+#: plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/groups/paste_mail.tpl:30
+#: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/goNtpServer.tpl:13
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/systems/glpi.tpl:100
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/phonesettings.tpl:178
+#: plugins/admin/systems/phonesettings.tpl:193
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:61
-#: plugins/admin/systems/workstationStartup.tpl:81
-#: plugins/admin/systems/workstationStartup.tpl:100
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/servRepositorySetup.tpl:36
@@ -401,28 +460,40 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:423
-#: plugins/admin/systems/class_termDNS.inc:444
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:277
-#: plugins/admin/ogroups/generic.tpl:39
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
+#: plugins/admin/systems/goMailServer.tpl:56
+#: plugins/admin/systems/goMailServer.tpl:79
+#: plugins/admin/systems/goMailServer.tpl:96
+#: plugins/admin/systems/goMailServer.tpl:120
+#: plugins/admin/systems/goMailServer.tpl:136
+#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/fai/faiVariable.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:61 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:40
-#: plugins/admin/fai/faiHook.tpl:48 plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/mimetypes/generic.tpl:87
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/posix_groups.tpl:81
 #: 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/generic_picture.tpl:35
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/connectivity/main.inc:120
@@ -430,37 +501,43 @@ msgstr ""
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
-#: plugins/gofax/blocklists/generic.tpl:82
+#: plugins/personal/environment/hotplugDialogNew.tpl:52
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
+#: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:345
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:57
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:642
-#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:310
+#: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/systems/class_systemManagement.inc:484
+#: plugins/admin/systems/servdns.tpl:23
+#: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goNtpServer.tpl:24
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/servRepository.tpl:66
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/goFonServer.tpl:26
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
@@ -469,14 +546,27 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/servdnseditzone.tpl:120
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/ServiceAddDialog.tpl:31
+#: plugins/admin/systems/goKrbServer.tpl:21
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
+#: plugins/admin/systems/goImapServer.tpl:96
+#: plugins/admin/systems/goSyslogServer.tpl:8
+#: plugins/admin/systems/goGlpiServer.tpl:26
+#: plugins/admin/systems/goCupsServer.tpl:8
+#: plugins/admin/systems/goTerminalServer.tpl:19
+#: plugins/admin/systems/goFaxServer.tpl:18
+#: plugins/admin/systems/goLogDBServer.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:348
-#: plugins/admin/ogroups/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:598
-#: plugins/admin/fai/class_faiManagement.inc:603
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -485,28 +575,36 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiPackageNew.tpl:45
-#: plugins/admin/fai/faiNewBranch.tpl:18
+#: plugins/admin/fai/faiPackageNew.tpl:51
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:351
+#: plugins/admin/mimetypes/remove.tpl:15
 #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
-#: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/snapshotdialog.tpl:39
+#: ihtml/themes/default/snapshotdialog.tpl:82
 msgid "Cancel"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
+#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: plugins/admin/systems/class_servGeneric.inc:321
+#: plugins/admin/systems/class_systemManagement.inc:765
+#: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:386
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -521,67 +619,84 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:418
+#: plugins/admin/systems/class_printGeneric.inc:483
 msgid "not defined"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:35
+#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
+#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
+#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
+#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:172
+#: plugins/admin/systems/phonesettings.tpl:187
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/personal/environment/environment.tpl:138
 #: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:182
-#: plugins/gofax/blocklists/generic.tpl:64
+#: plugins/personal/environment/environment.tpl:183
+#: plugins/personal/environment/class_environment.inc:626
+#: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:52
 #: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
-#: plugins/admin/groups/generic.tpl:106 plugins/admin/users/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:110 plugins/admin/groups/paste_mail.tpl:31
+#: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/workstationStartup.tpl:62
-#: plugins/admin/systems/workstationStartup.tpl:82
+#: plugins/admin/systems/phonesettings.tpl:179
+#: plugins/admin/systems/phonesettings.tpl:194
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:438
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:271
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/conference/remove.tpl:14
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/goShareServer.tpl:12
+#: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/mimetypes/remove.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
+#: ihtml/themes/default/remove.tpl:13
 msgid "Delete"
 msgstr ""
 
@@ -628,71 +743,76 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:102
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
+#: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:140
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:144
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:145
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
-#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/nagios/main.inc:104
-#: plugins/gofax/blocklists/generic.tpl:80
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:104
+#: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:640
-#: plugins/admin/applications/class_applicationManagement.inc:308
-#: plugins/admin/departments/class_departmentManagement.inc:347
-#: plugins/admin/systems/class_systemManagement.inc:720
-#: plugins/admin/ogroups/class_ogroupManagement.inc:346
-#: plugins/admin/fai/class_faiManagement.inc:596
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/ogroups/class_ogroupManagement.inc:332
+#: plugins/admin/fai/class_faiManagement.inc:585
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-msgid "Finish"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+msgid "Ok"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
 #: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -700,24 +820,25 @@ msgstr ""
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
 #: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/fai/faiVariable.tpl:44
+#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/goShareServer.tpl:11
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:41
-#: plugins/admin/fai/faiHook.tpl:45 plugins/gofon/phoneaccount/main.inc:113
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
 
@@ -725,6 +846,12 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
+#: plugins/personal/mail/copypaste.tpl:1
+#: plugins/personal/mail/class_mailAccount.inc:983
+#: plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
+msgstr ""
+
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
@@ -754,126 +881,212 @@ msgstr ""
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
+#: plugins/addons/notifications/class_msgplug.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
 #: 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/admin/acl/class_aclManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7 include/class_acl.inc:7
 msgid "This does something"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:62
+#: plugins/personal/mail/class_mailAccount.inc:90
+#: plugins/admin/groups/class_groupMail.inc:75
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:171
+#: plugins/personal/mail/class_mailAccount.inc:151
+#: plugins/admin/groups/class_groupMail.inc:173
+#, php-format
+msgid "Can't get quota information for '%s'."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:211
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:220
-#: plugins/admin/groups/class_groupMail.inc:267
+#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:221
-#: plugins/admin/groups/class_groupMail.inc:268
+#: plugins/personal/mail/class_mailAccount.inc:259
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:223
-#: plugins/admin/groups/class_groupMail.inc:270
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:223
-#: plugins/admin/groups/class_groupMail.inc:271
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:271
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:277
-#: plugins/admin/groups/class_groupMail.inc:330
+#: plugins/personal/mail/class_mailAccount.inc:318
+#: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:312
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/admin/groups/class_groupMail.inc:358
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:363
+#: plugins/personal/mail/class_mailAccount.inc:371
+#: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/personal/mail/class_mailAccount.inc:624
+#, php-format
+msgid "Removing of user/mail account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:728
+#, php-format
+msgid "Saving of user/mail account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:710
-#: plugins/admin/groups/class_groupMail.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:781
+#: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:714
-#: plugins/personal/mail/class_mailAccount.inc:718
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:828
-#: plugins/admin/ogroups/class_mailogroup.inc:77
+#: plugins/personal/mail/class_mailAccount.inc:795
+#: plugins/admin/groups/class_groupMail.inc:812
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:730
-#: plugins/admin/groups/class_groupMail.inc:834
+#: plugins/personal/mail/class_mailAccount.inc:801
+#: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:843
+#: plugins/personal/mail/class_mailAccount.inc:810
+#: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:749
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:820
+#: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:753
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:969
+msgid "Waiting for kolab to remove mail properties."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:971
+msgid ""
+"Please remove the mail account first, to allow kolab to call its remove "
+"methods."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
+msgid "Mail address"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
+#: plugins/admin/systems/servservice.tpl:107
+msgid "Mail server"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:995
+msgid "Mail max size"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
+msgid "Forwarding address"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:997
+msgid "Local delivery"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:998
+msgid "Reject due to mailsize"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:999
+msgid "Use spam filter"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1000
+msgid "Add vacation information"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1002
+msgid "Only insider delivery"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1003
+msgid "Spam level"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1004
+msgid "Spam mail box"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1005
+msgid "Mail alternative addresses"
+msgstr ""
+
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/users/class_divListUsers.inc:224
 msgid "Change password"
 msgstr ""
 
@@ -909,7 +1122,6 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/personal/connectivity/opengw.tpl:49
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr ""
@@ -928,14 +1140,12 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: include/functions.inc:1345 ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:114
-#: ihtml/themes/altlinux/setup_finish.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1475
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -945,17 +1155,35 @@ msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/personal/generic/paste_generic.tpl:32
 #: 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 plugins/admin/systems/servdb.tpl:128
-#: 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
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
+#: plugins/admin/systems/goFonServer.tpl:8
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/systems/goKrbServer.tpl:12
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
+#: plugins/admin/systems/goGlpiServer.tpl:9
+#: plugins/admin/systems/goFaxServer.tpl:8
+#: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
+#: ihtml/themes/default/login.tpl:41
 #: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr ""
 
+#: plugins/personal/password/nochange.tpl:2
+msgid "Password change not allowed"
+msgstr ""
+
+#: plugins/personal/password/nochange.tpl:6
+msgid "You are not allowed to change your password at this time"
+msgstr ""
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -967,14 +1195,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:271
+#: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:276
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -994,21 +1222,27 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:643
 msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:13
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:21
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1017,22 +1251,28 @@ msgid "Status"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
@@ -1041,6 +1281,7 @@ msgid "Account"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr ""
 
@@ -1052,27 +1293,41 @@ msgstr ""
 msgid "Select groups to add"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/personal/posix/posix_groups.tpl:32
 msgid "Display groups of department"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:41
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Ignore subtrees"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:53
 msgid "Display groups matching"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:44
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/admin/groups/class_divListGroup.inc:71
+#: plugins/admin/ogroups/class_divListOGroup.inc:78
 msgid "Regular expression for matching group names"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:64
 msgid "Display groups of user"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1094,7 +1349,7 @@ msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr ""
 
@@ -1107,293 +1362,345 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:989
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+msgid "active, password not changable"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:132
+msgid "active, password expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:979
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/admin/systems/class_workstationStartup.inc:500
-#: plugins/admin/systems/class_workstationService.inc:114
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationStartup.inc:759
+#: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:242
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:248
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:262
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:263
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:252
+#: plugins/personal/posix/class_posixAccount.inc:266
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:269
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:433
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
-#: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:60
-#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:547
+#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:547
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:570
+#: plugins/personal/posix/class_posixAccount.inc:548
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:742
+#: plugins/personal/posix/class_posixAccount.inc:594
+#, php-format
+msgid "Removing of user/posix account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:743
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:832
+#, php-format
+msgid "Saving of user/posix account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:893
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:917
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:921
-#: plugins/admin/groups/class_groupGeneric.inc:686
+#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:924
-#: plugins/admin/groups/class_groupGeneric.inc:689
+#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:932
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:945
+#: plugins/personal/posix/class_posixAccount.inc:935
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:938
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:951
+#: plugins/personal/posix/class_posixAccount.inc:941
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:956
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:959
+#: plugins/personal/posix/class_posixAccount.inc:949
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:964
+#: plugins/personal/posix/class_posixAccount.inc:954
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1091
-#: plugins/admin/groups/class_groupGeneric.inc:725
+#: plugins/personal/posix/class_posixAccount.inc:1081
+#: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:1220
+msgid "POSIX account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1230
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
+msgid "User ID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1231
+msgid "Group ID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1236
+msgid "Shadow min"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1237
+msgid "Shadow max"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1238
+msgid "Shadow warning"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1239
+msgid "Shadow inactive"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1240
+msgid "Shadow last change"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1242
+msgid "Shadow expire"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1244
+msgid "System trust model"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:4
+msgid "Posix settings"
+msgstr ""
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1404,7 +1711,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/class_sambaAccount.inc:644
 msgid "Profile path"
 msgstr ""
 
@@ -1417,6 +1724,7 @@ msgid "Allow user to change password from client"
 msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -1425,6 +1733,7 @@ msgid "Temporary disable samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr ""
 
@@ -1433,10 +1742,12 @@ msgid "Terminal Server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr ""
 
@@ -1453,17 +1764,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:648
+#: plugins/personal/samba/class_sambaAccount.inc:651
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:650
+#: plugins/personal/samba/class_sambaAccount.inc:653
 msgid "IDLE"
 msgstr ""
 
@@ -1501,14 +1812,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:264
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:279
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:291
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1521,6 +1835,7 @@ msgid "Allow connection from these workstations only"
 msgstr ""
 
 #: plugins/personal/samba/main.inc:123
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr ""
 
@@ -1532,98 +1847,140 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:207
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:206
+#: plugins/personal/samba/class_sambaAccount.inc:208
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:216
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:218
+#: plugins/personal/samba/class_sambaAccount.inc:221
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:220
+#: plugins/personal/samba/class_sambaAccount.inc:222
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:458
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:627
+#, php-format
+msgid "Removing of user/samba account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/class_sambaAccount.inc:656
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/class_sambaAccount.inc:662
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:843
+#: plugins/personal/samba/class_sambaAccount.inc:846
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:867
+#: plugins/personal/samba/class_sambaAccount.inc:870
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
+#: plugins/personal/samba/class_sambaAccount.inc:974
+#, php-format
+msgid "Saving of user/samba account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
+msgid "Account expires"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1056
+msgid "Allow user to change password"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1057
+msgid "Password expires"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1058
+msgid "Generic home directory"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1059
+msgid "Generic samba home drive"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1060
+msgid "Generic script path"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1061
+msgid "Generic profile path"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1063
+msgid "Allow connection from"
+msgstr ""
+
 #: plugins/personal/generic/class_user.inc:256
 msgid "female"
 msgstr ""
@@ -1632,398 +1989,558 @@ msgstr ""
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:270
+#: plugins/personal/generic/class_user.inc:272
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:326
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:420
+#: plugins/personal/generic/class_user.inc:422
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:461
+#: plugins/personal/generic/class_user.inc:463
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:879
+#: plugins/personal/generic/class_user.inc:548
+#, php-format
+msgid "Removing of user/generic account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:837
+#, php-format
+msgid "Saving of user/generic account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:907
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:947
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:952
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:554
+#: plugins/personal/generic/class_user.inc:964
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:967
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:557
+#: plugins/personal/generic/class_user.inc:979
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:976
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:993
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:202
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:205
+#: plugins/personal/generic/class_user.inc:1010
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:208
+#: plugins/personal/generic/class_user.inc:1013
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/personal/generic/class_user.inc:1016
+#: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
+#: plugins/personal/generic/class_user.inc:1019
+#: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1140
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
+msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:15
-#: plugins/personal/generic/generic_picture.tpl:6
-msgid "Personal picture"
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
+msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
+msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:25
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:19
-msgid "Last name"
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
+msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:30
-msgid "Template name"
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
+msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:23
-msgid "First name"
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
+msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
-msgid "Login"
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
+msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:49
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
+msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:57
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
+msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:65
-msgid "Date of birth"
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
+msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:82
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
-msgid "Set"
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
+msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
-#: html/getxls.php:224
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:98
-msgid "Preferred langage"
+#: plugins/personal/generic/class_user.inc:1308
+msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:109
+#: plugins/personal/generic/class_user.inc:1313
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
+msgid "Users"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
-#: plugins/admin/groups/class_groupManagement.inc:369
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:336
+#: plugins/admin/applications/class_divListApplication.inc:112
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_ogroupManagement.inc:374
-#: plugins/admin/fai/class_faiManagement.inc:667
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
 #: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:113
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:116
-#: plugins/admin/groups/generic.tpl:26
-#: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
-#: plugins/admin/systems/printer.tpl:25
-#: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
-msgid "Select a base"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:129
-#: plugins/personal/generic/generic.tpl:273
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_edit.tpl:182
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
-msgid "Address"
+#: plugins/personal/generic/class_user.inc:1318
+msgid "User password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:133
-msgid "Private phone"
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
+msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:137
-msgid "Homepage"
+#: plugins/personal/generic/class_user.inc:1320
+#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
+#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:146
-msgid "Password storage"
+#: plugins/personal/generic/class_user.inc:1321
+msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:156
-#: plugins/personal/generic/generic_certs.tpl:3
-msgid "Certificates"
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:158
-msgid "Edit certificates"
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
+msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:162
-msgid "Kerberos"
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
+msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:163
-msgid "Edit properties"
+#: plugins/personal/generic/class_user.inc:1325
+msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:179
-msgid "Organizational information"
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
+msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:191 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:195
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:422
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/admin/applications/class_applicationManagement.inc:361
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:424
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/ogroups/class_ogroupManagement.inc:385
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
+#: plugins/gofon/macro/class_divListMacros.inc:52
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:199
-msgid "Department No."
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
+msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:205
-msgid "Employee No."
+#: plugins/personal/generic/class_user.inc:1330
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:211
-msgid "Employee type"
+#: plugins/personal/generic/class_user.inc:1331
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:227
-#: plugins/personal/generic/generic.tpl:366
-msgid "Room No."
+#: plugins/personal/generic/class_user.inc:1332
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:239
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:95
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
-msgid "Mobile"
+#: plugins/personal/generic/class_user.inc:1333
+msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:243
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
+msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/godfs/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:269
-#: plugins/admin/departments/generic.tpl:47 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
-msgid "Vocation"
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:291
-msgid "Unit description"
+#: plugins/personal/generic/class_user.inc:1338
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:299
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:1339
+msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:307
-msgid "Functional title"
+#: plugins/personal/generic/class_user.inc:1340
+msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:314
-msgid "Role"
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
+msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:326
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:1342
+msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:334
-msgid "Unit"
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:341
-msgid "Street"
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
+msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:347
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
-msgid "Postal code"
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:353
-msgid "House identifier"
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:50
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:375
-msgid "Please use the phone tab"
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
+msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:388
-msgid "Last delivery"
+#: plugins/personal/generic/generic.tpl:47
+#: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/admin/users/template.tpl:23
+msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:395
-msgid "Public visible"
+#: plugins/personal/generic/generic.tpl:52
+msgid "Template name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:27
+msgid "First name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:63
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/admin/users/template.tpl:32
+msgid "Login"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:109
+#: ihtml/themes/default/sizelimit.tpl:14
+msgid "Set"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
+#: html/getxls.php:224
+msgid "Sex"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:128
+msgid "Preferred langage"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:146
+msgid "Choose subtree to place user in"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
+#: plugins/gofax/blocklists/generic.tpl:21
+#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
+#: plugins/admin/groups/generic.tpl:29
+#: plugins/admin/applications/generic.tpl:39
+#: plugins/admin/applications/generic.tpl:41
+#: plugins/admin/departments/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:36
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
+#: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/workstation.tpl:31
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
+#: plugins/admin/systems/wingeneric.tpl:18
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:27
+#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/mimetypes/generic.tpl:45
+#: plugins/admin/mimetypes/generic.tpl:47 plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
+#: plugins/gofon/conference/generic.tpl:41
+msgid "Select a base"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:182
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+msgid "Address"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:175
+msgid "Private phone"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:196
+msgid "Password storage"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:208
+#: plugins/personal/generic/generic_certs.tpl:3
+msgid "Certificates"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:211
+msgid "Edit certificates"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
+msgid "Kerberos"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:220
+msgid "Edit properties"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:238
+msgid "Organizational information"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:266
+msgid "Department No."
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:274
+msgid "Employee No."
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
+msgid "Room No."
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:318
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+msgid "Mobile"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:326
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:496
+msgid "Please use the phone tab"
 msgstr ""
 
 #: plugins/personal/generic/password.tpl:2
@@ -2033,20 +2550,42 @@ msgid ""
 "then encode it with the selected method."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:23
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
 msgid "Remove picture"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/environment/hotplugDialogNew.tpl:51
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/systems/servdns.tpl:21
+#: plugins/admin/systems/servkolab.tpl:203
+#: plugins/admin/systems/goNtpServer.tpl:22
+#: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/servRepository.tpl:64
+#: plugins/admin/systems/goFonServer.tpl:24
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/servdnseditzone.tpl:116
+#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/goKrbServer.tpl:19
+#: plugins/admin/systems/goLdapServer.tpl:7
+#: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
+#: plugins/admin/systems/goImapServer.tpl:94
+#: plugins/admin/systems/goSyslogServer.tpl:6
+#: plugins/admin/systems/goGlpiServer.tpl:24
+#: plugins/admin/systems/goCupsServer.tpl:6
+#: plugins/admin/systems/goTerminalServer.tpl:17
+#: plugins/admin/systems/goFaxServer.tpl:16
+#: plugins/admin/systems/goLogDBServer.tpl:16
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: include/class_MultiSelectWindow.inc:44
+#: include/class_MultiSelectWindow.inc:78
+#: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr ""
 
@@ -2065,19 +2604,21 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
+#: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:490
+#: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/printer.tpl:53 plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:101
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/fai/faiPackage.tpl:62
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goMailServer.tpl:57
+#: plugins/admin/systems/goMailServer.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 msgid "Remove"
 msgstr ""
 
@@ -2093,6 +2634,18 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl:35
+msgid "Clear password"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl:36
+msgid "Set new password"
+msgstr ""
+
 #: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
 msgstr ""
@@ -2148,6 +2701,7 @@ msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr ""
 
@@ -2160,6 +2714,7 @@ msgid "Limit proxy access to working time"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
@@ -2171,11 +2726,42 @@ msgstr ""
 msgid "PHPGroupware"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
+#, php-format
+msgid "Removing of user/PHPgw account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
+#, php-format
+msgid "Saving of user/PHPgw account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+msgid "PHP GW account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+msgid "phpgwAccountExpires"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+msgid "phpgwAccountType"
+msgstr ""
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
+#: plugins/personal/connectivity/kolab.tpl:3
+#: plugins/personal/connectivity/kolab.tpl:19
 msgid "Kolab account"
 msgstr ""
 
@@ -2185,264 +2771,457 @@ msgid ""
 "you add a mail account."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
+#: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:38
 msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:24
+#: plugins/personal/connectivity/kolab.tpl:40
 msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
+#: plugins/personal/connectivity/kolab.tpl:48
 msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/kolab.tpl:51
 #: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:55
 msgid "Future"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:56
+#: plugins/personal/connectivity/oxchange.tpl:26
+#: plugins/personal/connectivity/oxchange.tpl:30
 msgid "days"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:45
+#: plugins/personal/connectivity/kolab.tpl:61
 msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:105
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:113
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:142
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:180
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:232
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
+#, php-format
+msgid "Removing of user/kolab account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:237
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:259
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
+#, php-format
+msgid "Saving of user/kolab account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+msgid "Kolab account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+msgid "Mail size restriction"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+msgid "Free busy information"
+msgstr ""
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr ""
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
+#, php-format
+msgid "Removing of user/webDAV account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
+#, php-format
+msgid "Saving of user/webDAV account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
+#, php-format
+msgid "Removing of user/pureftpd account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
+#, php-format
+msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+msgid "Ftp"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+msgid "Pure ftp account"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+msgid "Quota files"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+msgid "Upload ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+msgid "Quota MBytes"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+msgid "Download ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+msgid "Upload bandwith"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+msgid "Download bandwith"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#, php-format
+#: plugins/personal/connectivity/oxchange.tpl:2
 msgid ""
-"This account has %s features disabled. Posix features are needed for "
-"openXchange accounts, enable them first."
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-msgid "OpenXchange"
+#: plugins/personal/connectivity/oxchange.tpl:10
+msgid "Open-Xchange account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, php-format
-msgid ""
-"This account has %s features disabled. Mail features are needed for "
-"openXchange accounts, enable them first."
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:25
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:29
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:41
+msgid "User Information"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:791
+#: plugins/personal/connectivity/oxchange.tpl:45
+msgid "User Timezone"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:795
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
+#, php-format
+msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
+msgid ""
+"The Open-Xchange accountname is empty and thus invalid! Check to make sure "
+"that "
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
+msgid "you are not using any strange characters in the loginname."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
+#, php-format
+msgid "Saving of user/oxchange account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
+#, php-format
+msgid "Creating of user/oxchange account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+msgid "Open xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+msgid "Open xchange account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+msgid "OXAppointmentDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+msgid "mailEnabled"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+msgid "OXTimeZone"
+msgstr ""
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
+#: plugins/personal/connectivity/class_connectivity.inc:65
 msgid "This account has no connectivity extensions."
 msgstr ""
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+msgid "Connectivity settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+msgid "Connectivity  account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:171
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
+#, php-format
+msgid "Removing of user/proxy account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:174
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
+#, php-format
+msgid "Saving of user/proxy account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+msgid "gosaProxyID"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+msgid "Limit proxy access"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+msgid "Limit quota"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+msgid "Quota limit period"
+msgstr ""
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
+#, php-format
+msgid "Removing of user/intranet account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
+#, php-format
+msgid "Saving of user/intranet account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+msgid "Intranet account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+msgid "GOsa intranet account"
+msgstr ""
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr ""
 
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
+#, php-format
+msgid "Removing of user/PPTP account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
+#, php-format
+msgid "Saving of user/PPTP account with dn '%s' failed."
+msgstr ""
+
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr ""
 
@@ -2455,15 +3234,18 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/ogroups/class_termgroup.inc:46
 msgid "Locked"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:64
+#: plugins/personal/connectivity/opengw.tpl:49
 msgid "Teams"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr ""
 
@@ -2471,34 +3253,60 @@ msgstr ""
 msgid "PHPscheduleit"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
+#, php-format
+msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
+#, php-format
+msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+msgid "PHP Schedule it"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+msgid "PHP Schedule it settings"
+msgstr ""
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+msgid "Open groupware account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+msgid "Open groupware account"
+msgstr ""
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:102
+#: plugins/personal/environment/environment.tpl:103
 #: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
@@ -2524,6 +3332,7 @@ msgid "Profil quota"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr ""
 
@@ -2532,6 +3341,7 @@ msgid "Kiosk profile settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr ""
 
@@ -2539,34 +3349,47 @@ msgstr ""
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:81
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/class_environment.inc:1264
+msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:86
+#: plugins/personal/environment/environment.tpl:87
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/environment.tpl:106
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/workstationStartup.tpl:86
+#: plugins/admin/systems/class_workstationStartup.inc:1096
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/goShareServer.tpl:1
+#: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr ""
 
+#: plugins/personal/environment/environment.tpl:111
+msgid "User used to connect to the share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:112
+msgid "Select a share"
+msgstr ""
+
 #: plugins/personal/environment/environment.tpl:118
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
+msgid "Mount path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:126
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:127
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
@@ -2581,8 +3404,8 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:367
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/admin/groups/class_divListGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:90
 msgid "New"
 msgstr ""
 
@@ -2590,40 +3413,46 @@ msgstr ""
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/environment.tpl:174
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:183
-msgid "Admin Toggle"
+#: plugins/personal/environment/environment.tpl:184
+msgid "Toggle admin"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:185
+msgid "Toggle default"
 msgstr ""
 
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:114
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:117
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:123
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:128
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -2644,9 +3473,11 @@ msgid "Choose the department the search will be based    on"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/groups/group_objects.tpl:38
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/groups/group_objects.tpl:46
+#: plugins/admin/users/class_divListUsers.inc:72
+#: plugins/admin/applications/class_divListApplication.inc:58
 #: plugins/admin/systems/glpiSelectUser.tpl:35
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr ""
@@ -2655,75 +3486,144 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:251
-#: plugins/personal/environment/class_environment.inc:288
+#: plugins/personal/environment/class_environment.inc:198
+msgid "auto"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:220
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
+#, php-format
+msgid ""
+"You have specified an external resolution hook which can't be read, please "
+"check the permission of the file '%s'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:297
+#: plugins/personal/environment/class_environment.inc:334
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:252
-#: plugins/personal/environment/class_environment.inc:289
+#: plugins/personal/environment/class_environment.inc:298
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:261
-#: plugins/personal/environment/class_environment.inc:266
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:312
+#: plugins/personal/environment/class_environment.inc:340
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:262
-#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:308
+#: plugins/personal/environment/class_environment.inc:341
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:267
-#: plugins/personal/environment/class_environment.inc:300
+#: plugins/personal/environment/class_environment.inc:313
+#: plugins/personal/environment/class_environment.inc:346
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:379
-msgid "auto"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:411
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/personal/environment/class_environment.inc:461
+#: plugins/personal/environment/class_environment.inc:777
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:507
-#: plugins/personal/environment/class_environment.inc:517
-#: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:396
+#: plugins/personal/environment/class_environment.inc:544
+#: plugins/personal/environment/class_environment.inc:555
+#: plugins/admin/systems/class_terminalStartup.inc:187
+#: plugins/admin/systems/class_workstationStartup.inc:588
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:752
+#: plugins/personal/environment/class_environment.inc:613
+#: plugins/personal/environment/class_environment.inc:614
+#: plugins/personal/environment/class_environment.inc:622
+#: plugins/personal/environment/class_environment.inc:623
+msgid "Reset password hash"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:627
+msgid "Delete share entry"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:780
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:831
+#, php-format
+msgid "Removing of user/environment account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:884
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:759
+#: plugins/personal/environment/class_environment.inc:891
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:796
+#: plugins/personal/environment/class_environment.inc:929
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:890
-msgid "Error while writing printer"
+#: plugins/personal/environment/class_environment.inc:1037
+#, php-format
+msgid "Saving printer membership with dn %s failed "
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:961
+#: plugins/personal/environment/class_environment.inc:1106
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1075
-msgid "Admin"
+#: plugins/personal/environment/class_environment.inc:1176
+#, php-format
+msgid "Saving of user/environment account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1189
+msgid "group share"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1222
+msgid "Administrator"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1227
+#: plugins/personal/environment/class_environment.inc:1270
+msgid "Default printer"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1253
+msgid "Environment settings"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
+msgid "Profile server"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1267
+msgid "Profile quota"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1268
+#: plugins/personal/environment/logonManagement.tpl:56
+msgid "Logon script"
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
@@ -2744,11 +3644,15 @@ msgstr ""
 msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
 msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
+msgid "Please specify a valid script name."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:105
 msgid "Specified description contains invalid characters."
 msgstr ""
 
@@ -2762,24 +3666,51 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
+#: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
-#: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
+#: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/paste_generic.tpl:21
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -2802,16 +3733,20 @@ msgstr ""
 msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:56
-msgid "Logon script"
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/notifications/contents.tpl:12
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/applications/class_applicationManagement.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:481
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/ogroups/class_ogroupManagement.inc:335
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -2819,7 +3754,12 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiNewBranch.tpl:17
+#: plugins/admin/fai/faiNewBranch.tpl:19
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:348
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
+#: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
 msgid "Apply"
 msgstr ""
 
@@ -2859,11 +3799,15 @@ msgid "Device name"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
-msgid "Device ID"
+msgid "Vendor ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:33
+msgid "Product ID"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-msgid "save"
+#: plugins/personal/environment/hotplugDialogNew.tpl:40
+msgid "Device ID"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
@@ -2878,14 +3822,15 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpiManufacturer.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:202
+#: include/class_MultiSelectWindow.inc:79
 msgid "Close"
 msgstr ""
 
@@ -2894,35 +3839,37 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:39 html/getxls.php:174
-msgid "Mail address"
-msgstr ""
-
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr ""
 
@@ -2982,56 +3929,132 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#, php-format
+msgid "Saving of user/nagios account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
+#, php-format
+msgid "Removing of user/nagios account with dn '%s' failed."
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+msgid "Nagios account settings"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+msgid "View all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+msgid "View all services"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+msgid "Trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+msgid "Trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+msgid "View configuration information"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+msgid "View system informations"
+msgstr ""
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+msgid "This account has no netatalk extensions."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid "Remove netatalk account"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/personal/netatalk/class_netatalk.inc:133
 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."
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
+#: plugins/personal/netatalk/class_netatalk.inc:256
+#, php-format
+msgid "Saving of user/netatalk account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
+#: plugins/personal/netatalk/class_netatalk.inc:316
+#, php-format
+msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+msgid "apple-user-homeDirectory"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
+msgid "Path"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -3046,321 +4069,513 @@ msgstr ""
 msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiSummaryTab.inc:309
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:34
+#: plugins/gofax/blocklists/generic.tpl:39
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:43
+#: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
+#: plugins/gofax/blocklists/generic.tpl:61
 msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:72
+#: plugins/gofax/blocklists/generic.tpl:77
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr ""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:172
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:189
 msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:753
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:753
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/admin/fai/class_faiProfile.inc:286
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:755
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:413
+#, php-format
+msgid "Removing of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:755
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
+msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/systems/class_systemManagement.inc:757
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-msgid "Go to users department"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
+msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:757
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/fai/class_faiManagement.inc:638
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-msgid "Home"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
+msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
-msgid "Create new blocklist"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
+msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
-msgid "New Blocklist"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
+msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/admin/fai/class_faiManagement.inc:668
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit department"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
+#, php-format
+msgid "Saving of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/admin/fai/class_faiManagement.inc:668
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+msgid "Fax Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinter.tpl:15
-#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
-#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/class_faiScript.inc:206
-#: plugins/admin/fai/class_faiManagement.inc:686
-#: plugins/admin/fai/class_faiHook.inc:229
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "edit"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-msgid "Edit user"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+msgid "Blocklist type"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/admin/fai/class_faiScript.inc:207
-#: plugins/admin/fai/class_faiManagement.inc:687
-#: plugins/admin/fai/class_faiHook.inc:230
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "delete"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-msgid "Delete user"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
+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/class_blocklistManagement.inc:323
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 msgid "Blocklist name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:424
-#: plugins/admin/users/class_userManagement.inc:699
-#: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/applications/class_divListApplication.inc:52
+#: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:401
-#: plugins/admin/fai/class_faiManagement.inc:683
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_divListSystemService.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/acl/class_divListACL.inc:50
+#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:56
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/conference/class_divListConferences.inc:55
 msgid "Actions"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
-msgid "This table displays faxblocklists for the selected tree."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
-msgid "send"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
-msgid "receive"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
-msgid "You have no permissions to create a blocklist on this 'Base'."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:190
-msgid "Required field 'Name' is not set."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Select to search within subtrees"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
-msgid "Required field 'Name' contains invalid characters"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
+msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
-msgid "Specified name is already used."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Go to root department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
-msgid "No permission to create a blocklist on this base."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/fai/remove.tpl:2 plugins/admin/fai/remove_branch.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:236 html/index.php:296 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+#: include/class_acl.inc:357
+msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/gofon/macro/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
+msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
-msgid "Blocklist management"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
+msgid "Home"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+msgid "Create new blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+msgid "New Blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Submit department"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/users/class_divListUsers.inc:221
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
+#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/acl/class_divListACL.inc:122
+#: plugins/admin/fai/class_faiScript.inc:238
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:208
+#: plugins/admin/fai/class_faiTemplate.inc:211
+#: plugins/admin/fai/class_faiHook.inc:261
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_divListFai.inc:221
+#: plugins/admin/fai/class_divListFai.inc:226
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:128
+#: plugins/gofon/conference/class_divListConferences.inc:124
+#: include/class_acl.inc:359 include/class_acl.inc:397
+msgid "edit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/users/class_divListUsers.inc:222
+msgid "Edit user"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/users/class_divListUsers.inc:226
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/acl/class_divListACL.inc:125
+#: plugins/admin/fai/class_faiScript.inc:242
+#: plugins/admin/fai/class_faiTemplate.inc:212
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:131
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+#: include/class_acl.inc:360 include/class_acl.inc:398
+msgid "delete"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/admin/users/class_divListUsers.inc:227
+msgid "Delete user"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:12
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -3370,6 +4585,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr ""
 
@@ -3394,6 +4610,7 @@ msgid "Deliver fax as mail"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -3490,12 +4707,16 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
-#: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:515
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
+#: plugins/admin/groups/class_groupApplication.inc:632
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#, php-format
+msgid "Removing of user/fax account with dn '%s' failed."
+msgstr ""
+
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr ""
@@ -3518,6 +4739,27 @@ msgid ""
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+#, php-format
+msgid "Saving of user/fax account with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+msgid "Fax account settings"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+msgid "Receive blocklist"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+msgid "Send blocklist"
+msgstr ""
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3564,8 +4806,8 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:671
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr ""
@@ -3636,7 +4878,7 @@ msgstr ""
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr ""
 
@@ -3644,73 +4886,44 @@ msgstr ""
 msgid "FAX Reports"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofax/faxreports/class_faxreport.inc:106
+#: plugins/gofax/faxreports/class_faxreport.inc:116
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/gofax/faxreports/class_faxreport.inc:109
 #: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
+#: plugins/gofon/fonreports/class_fonreport.inc:160
 msgid "There is no mysql extension available, please check your php setup."
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
+#: plugins/gofax/faxreports/class_faxreport.inc:120
+#: plugins/gofax/faxreports/class_faxreport.inc:125
 msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:266
 msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:185
+#: plugins/gofax/faxreports/class_faxreport.inc:157
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofon/fonreports/class_fonreport.inc:202
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+msgid "Fax report"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+msgid "Detailed view"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:15
@@ -3735,7 +4948,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:597
+#: plugins/admin/groups/class_groupApplication.inc:714
 msgid "Edit entry"
 msgstr ""
 
@@ -3833,10 +5046,11 @@ msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/main.inc:23
+#: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr ""
 
@@ -3855,12 +5069,18 @@ msgid ""
 "perform direct dials."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#: plugins/addons/addressbook/class_addressbook.inc:650
+#, php-format
+msgid "Removing of addressbook entry '%s' failed."
+msgstr ""
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
@@ -3895,16 +5115,11 @@ msgstr ""
 #: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:281
-#: plugins/addons/mailqueue/class_mailqueue.inc:346
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
-msgid "Given name"
-msgstr ""
-
 #: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr ""
@@ -3917,18 +5132,12 @@ msgstr ""
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
-msgid "User ID"
-msgstr ""
-
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/addons/addressbook/class_addressbook.inc:597
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:605
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3965,7 +5174,7 @@ msgstr ""
 msgid "Selected Template"
 msgstr ""
 
-#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/main.inc:40
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr ""
@@ -4034,14 +5243,18 @@ msgid "Import LDIF File"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
+msgid "Modify existing objects, keep untouched attributes"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+msgid "Remove existing entries first"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr ""
 
@@ -4164,10 +5377,11 @@ msgid "Hostname"
 msgstr ""
 
 #: plugins/addons/logview/contents.tpl:85
+#: plugins/addons/notifications/contents.tpl:44
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr ""
 
@@ -4295,7 +5509,7 @@ msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:349
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Active"
 msgstr ""
 
@@ -4335,327 +5549,504 @@ msgstr ""
 msgid "Display header from this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/main.inc:38
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:53
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
 msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
-"specified."
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:88
-#: plugins/addons/mailqueue/class_mailqueue.inc:107
-#: plugins/addons/mailqueue/class_mailqueue.inc:116
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
 #: plugins/addons/mailqueue/class_mailqueue.inc:198
 #, php-format
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:181
+#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:251
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
+msgid "There are no mail server specified."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:253
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:347
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:348
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:350
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/addons/godfs/contents.tpl:26
 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 menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
+#: plugins/addons/godfs/contents.tpl:40
+msgid "Display dfs shares matching"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
+#: plugins/addons/godfs/contents.tpl:44
+msgid "Regular expression for matching dfs share names"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
+#: plugins/addons/godfs/generic.tpl:16
+msgid "Fileserver"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
+#: plugins/addons/godfs/generic.tpl:20
+msgid "Share on Fileserver"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
+#: plugins/addons/godfs/generic.tpl:30
+msgid "DFS Location"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+msgid "DFS Managment"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+#, php-format
+msgid "Removing of DFS share with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:11
-msgid "Primary mail address for this shared folder"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+msgid "Go up one dfsshare"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+msgid "Create new dfsshare"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
+#: plugins/addons/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+msgid "Dfs share already exists."
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:88
-msgid "Forward messages to non group members"
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+msgid "Required Field \"Name of dfs Share\" is not set."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:6
-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/addons/godfs/class_dfsgeneric.inc:120
+msgid "Required Field \"Description\" is not set."
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+msgid "Required Field \"Fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+msgid "Required Field \"Location\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:186
+#, php-format
+msgid "Saving dfs/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:219
+#, php-format
+msgid "Removing dfs/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
 msgstr ""
 
+#: plugins/addons/notifications/main.inc:42
+#: plugins/addons/notifications/class_msgplug.inc:6
+msgid "Notifications"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
+#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:288
+#: plugins/addons/notifications/class_msgplug.inc:104
+msgid "You have no permissions to send a message!"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:108
+msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:116
+#: plugins/admin/systems/class_terminalGeneric.inc:171
+#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/systems/class_servGeneric.inc:80
+#: plugins/admin/systems/class_workstationGeneric.inc:144
+#: plugins/admin/ogroups/class_termgroup.inc:166
 #, php-format
-msgid "You're about to delete the group '%s'."
+msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:294
-#: plugins/admin/groups/class_groupManagement.inc:320
-msgid "You are not allowed to delete this group!"
+#: plugins/addons/notifications/class_msgplug.inc:122
+msgid "Please specify at least one recipient to send a message!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:367
-msgid "Create new group"
+#: plugins/addons/notifications/class_msgplug.inc:214
+msgid "No DESC tag in message file:"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "Edit this entry"
+#: plugins/addons/notifications/contents.tpl:2
+msgid "Notification target"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "Delete this entry"
+#: plugins/addons/notifications/contents.tpl:7
+msgid "Use target from"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:398
-#: plugins/admin/users/class_userManagement.inc:735
-msgid "Posix"
+#: plugins/addons/notifications/contents.tpl:21
+msgid "Available recipients"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:407
-#: plugins/admin/applications/class_applicationManagement.inc:352
-#: plugins/admin/ogroups/class_ogroupManagement.inc:491
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
+#: plugins/addons/notifications/contents.tpl:22
+#: ihtml/themes/default/acl.tpl:30
+msgid "List message possible targets"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:422
-msgid "Groupname"
+#: plugins/addons/notifications/contents.tpl:33
+msgid "Recipients"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:423
-#: plugins/admin/users/class_userManagement.inc:698
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/gofon/conference/generic.tpl:4
-msgid "Properties"
+#: plugins/addons/notifications/contents.tpl:34
+#: ihtml/themes/default/acl.tpl:42
+msgid "List message recipients"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:57
+msgid "Send message"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:68
+msgid "Notification send!"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:71
+msgid ""
+"Your message has been sent successfully. Press the continue button to get "
+"back to the notification plugin."
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:74
+#: plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
+#: plugins/admin/systems/SelectDeviceType.tpl:44
+#: plugins/admin/systems/ServiceAddDialog.tpl:29
+#: plugins/admin/fai/class_faiManagement.inc:430
+#: plugins/admin/fai/class_faiManagement.inc:595
+#: plugins/admin/fai/faiPackageNew.tpl:50
+#: 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
+#: ihtml/themes/default/snapshotdialog.tpl:80
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:245
+#, php-format
+msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:427
-#: plugins/admin/applications/class_applicationManagement.inc:366
-#: plugins/admin/ogroups/class_ogroupManagement.inc:405
-msgid "This table displays all groups, in the selected tree."
+#: plugins/admin/groups/class_groupManagement.inc:251
+#: plugins/admin/groups/class_groupManagement.inc:282
+msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:117
+#: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:169
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:311
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:312
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:317
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:650
-#: plugins/admin/ogroups/class_ogroup.inc:655
+#: plugins/admin/groups/class_groupGeneric.inc:435
+msgid "! unknown id"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:467
+#, php-format
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:496
+#: plugins/admin/groups/class_groupGeneric.inc:693
+#, php-format
+msgid "Removing of groups/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured SID found for '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:608
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:722
+#: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:660
+#: plugins/admin/groups/class_groupGeneric.inc:732
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:671
-#: plugins/admin/groups/class_groupGeneric.inc:678
+#: plugins/admin/groups/class_groupGeneric.inc:744
+#: plugins/admin/groups/class_groupGeneric.inc:758
+#: plugins/admin/groups/class_groupGeneric.inc:765
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
+#: plugins/admin/groups/class_groupGeneric.inc:862
+msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:7
-msgid "Add category"
+#: plugins/admin/groups/class_groupGeneric.inc:874
+msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:12
-msgid "Available applications"
+#: plugins/admin/groups/class_groupGeneric.inc:875
+msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
+#: plugins/admin/groups/class_groupGeneric.inc:878
+msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
+#: plugins/admin/groups/class_groupGeneric.inc:879
+msgid "Samba group type"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+msgid "Samba SID"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:5
+msgid "Select release name"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:16
+msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: plugins/admin/groups/application.tpl:19
+msgid "Add category"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:24
+msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:230
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:231
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:232
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:233
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:234
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:259
+#: plugins/admin/groups/class_groupMail.inc:312
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:377
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:325
+#: plugins/admin/groups/class_groupMail.inc:378
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:822
+#: plugins/admin/groups/class_groupMail.inc:613
+#, php-format
+msgid "Removing of groups/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:777
+#, php-format
+msgid "Saving of groups/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:806
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:855
+#: plugins/admin/groups/class_groupMail.inc:839
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:859
+#: plugins/admin/groups/class_groupMail.inc:843
 msgid "Please select a valid mail server."
 msgstr ""
 
+#: plugins/admin/groups/class_groupMail.inc:981
+msgid "Group mail"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:989
+msgid "Alternate addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:990
+msgid "Forwarding addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr ""
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr ""
@@ -4664,11 +6055,18 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
+#: plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:737
 msgid "Group name"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:9
+#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
 msgid "Posix name of the group"
 msgstr ""
 
@@ -4680,35 +6078,38 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:37
+#: plugins/admin/groups/generic.tpl:41
+#: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:37
+#: plugins/admin/groups/generic.tpl:41
+#: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/generic.tpl:43
+#: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:46
+#: plugins/admin/groups/generic.tpl:50
 msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:51
+#: plugins/admin/groups/generic.tpl:55
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:72
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:85
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:97
+#: plugins/admin/groups/generic.tpl:101
 msgid "Group members"
 msgstr ""
 
@@ -4716,297 +6117,328 @@ msgstr ""
 msgid "Select users to add"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:29
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/users/headpage.tpl:49
-#: plugins/admin/systems/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:59
-msgid "This 'dn' is no acl container."
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:207
-msgid "All fields are writeable"
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Search within subtree"
 msgstr ""
 
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
+#: plugins/admin/groups/group_objects.tpl:37
+msgid "Display users of department"
 msgstr ""
 
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
+#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/systems/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:295
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:304
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:307
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:319
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:327
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:393
+#: plugins/admin/groups/class_groupApplication.inc:520
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:429
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/fai/class_faiManagement.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:638
+#: plugins/admin/departments/class_divListDepartment.inc:112
 msgid "department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:529
+#: plugins/admin/groups/class_groupApplication.inc:646
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:560
-#: plugins/admin/groups/class_groupApplication.inc:596
+#: plugins/admin/groups/class_groupApplication.inc:677
+#: plugins/admin/groups/class_groupApplication.inc:713
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:564
-#: plugins/admin/groups/class_groupApplication.inc:594
+#: plugins/admin/groups/class_groupApplication.inc:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:565
-#: plugins/admin/groups/class_groupApplication.inc:595
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/groups/class_groupApplication.inc:712
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
+#: plugins/admin/groups/class_groupApplication.inc:737
+msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+#: plugins/admin/groups/class_groupApplication.inc:740
+#, php-format
+msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
+#: plugins/admin/groups/class_groupApplication.inc:744
+msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:72
-msgid "Show templates"
+#: plugins/admin/groups/class_groupApplication.inc:746
+msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
+#: plugins/admin/groups/class_groupApplication.inc:832
+#, php-format
+msgid "Removing of groups/applications with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
+#: plugins/admin/groups/class_groupApplication.inc:877
+#, php-format
+msgid "Saving of groups/applications with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
+#: plugins/admin/groups/class_groupApplication.inc:919
+#, php-format
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
+#: plugins/admin/groups/class_groupApplication.inc:1063
+msgid "Group applications"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+msgid "Application parameter"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:6
-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/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/groups/class_divListGroup.inc:41
 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 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/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
-msgid "Users"
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Groupname / Department"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:254
-#: plugins/admin/users/class_userManagement.inc:324
-msgid "You are not allowed to set this users password!"
+#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/gofon/conference/generic.tpl:4
+msgid "Properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:360
-#, php-format
-msgid "You're about to delete the user %s."
+#: plugins/admin/groups/class_divListGroup.inc:60
+msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:394
-msgid "You are not allowed to delete this user!"
+#: plugins/admin/groups/class_divListGroup.inc:60
+msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:495
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:277
-msgid "none"
+#: plugins/admin/groups/class_divListGroup.inc:61
+msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:566
-msgid "A person with the choosen name is already used in this tree."
+#: plugins/admin/groups/class_divListGroup.inc:61
+msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:681
-msgid "Create new user"
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:681
-msgid "New user"
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
-msgid "Create new template"
+#: plugins/admin/groups/class_divListGroup.inc:63
+msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
-msgid "New template"
+#: plugins/admin/groups/class_divListGroup.inc:63
+msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:689
-msgid "password"
+#: plugins/admin/groups/class_divListGroup.inc:64
+msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
-msgid "Username"
+#: plugins/admin/groups/class_divListGroup.inc:64
+msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:702
-msgid "This table displays all users, in the selected tree."
+#: plugins/admin/groups/class_divListGroup.inc:105
+msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:733
-msgid "GOsa"
+#: plugins/admin/groups/class_divListGroup.inc:139
+#: plugins/admin/users/class_divListUsers.inc:161
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:734
-msgid "Edit generic properties"
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+msgid "cut"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:736
-msgid "Edit UNIX properties"
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:738
-msgid "Edit environment properties"
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+msgid "copy"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:740
-msgid "Edit mail properties"
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
-msgid "Edit phone properties"
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/conference/class_divListConferences.inc:124
+msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:744
-msgid "Edit fax properies"
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:746
-msgid "Edit samba properties"
+#: plugins/admin/users/remove.tpl:6
+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/class_userManagement.inc:747
-msgid "Create user from template"
+#: 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:748
-msgid "Create user with this template"
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
+msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:807
-msgid "Online"
+#: plugins/admin/users/class_userManagement.inc:312
+#, php-format
+msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:814
-msgid "Offline"
+#: plugins/admin/users/class_userManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:345
+msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1041
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
+#: plugins/admin/users/class_userManagement.inc:453
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:277
+msgid "none"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
 #: plugins/admin/users/template.tpl:2
@@ -5020,62 +6452,182 @@ msgid ""
 "templates."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:602
-#: plugins/admin/fai/faiPackageNew.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"
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
 msgid "User administration"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/users/class_divListUsers.inc:35
+#: plugins/admin/users/class_divListUsers.inc:36
+#: plugins/admin/systems/glpiSelectUser.tpl:6
+msgid "List of users"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
+#: plugins/admin/users/class_divListUsers.inc:40
 msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+"This 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/class_divListUsers.inc:56
+#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22
+msgid "Username"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:60
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Select to see users that have only a GOsa object"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:110
+msgid "Create new user"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:110
+msgid "New user"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:112
+msgid "Create new template"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:112
+msgid "New template"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:159
+msgid "GOsa"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:160
+msgid "Edit generic properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:162
+msgid "Edit UNIX properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:164
+msgid "Edit environment properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:166
+msgid "Edit mail properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:168
+msgid "Edit phone properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:170
+msgid "Edit fax properies"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:172
+msgid "Edit samba properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:174
+msgid "Edit netatalk properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:175
+msgid "Create user from template"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:176
+msgid "Create user with this template"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:223
+msgid "password"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
+#: plugins/admin/users/class_divListUsers.inc:246
+msgid "Online"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
+#: plugins/admin/users/class_divListUsers.inc:253
+msgid "Offline"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:361
+#: plugins/admin/applications/class_applicationGeneric.inc:450
+#: plugins/admin/applications/class_divListApplication.inc:51
 msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:455
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
-#: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:489
+#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
+#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/ogroups/termgroup.tpl:85
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr ""
@@ -5085,48 +6637,67 @@ msgid "Path and/or binary name of application"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:34
+#: plugins/admin/mimetypes/generic.tpl:40
 msgid "Choose subtree to place application in"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:48
+#: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/mimetypes/generic.tpl:66
 msgid "Update"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:72
+#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:82
+#: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:95
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Upload"
 msgstr ""
 
+#: plugins/admin/applications/generic.tpl:103
+#: plugins/admin/fai/class_faiScript.inc:251
+#: plugins/admin/fai/class_faiTemplate.inc:224
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+msgid "Download"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationParameters.inc:52
 msgid "Remove options"
 msgstr ""
@@ -5145,6 +6716,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr ""
 
@@ -5157,90 +6729,152 @@ msgstr ""
 msgid "Add option"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:158
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, php-format
+msgid "Removing of application parameters with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:159
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, php-format
+msgid "Saving of application parameters with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/applications/remove.tpl:6
+#: plugins/admin/mimetypes/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: ihtml/themes/default/remove.tpl:6
 msgid ""
 "This may be used by several groups. 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/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:87
+#: plugins/admin/applications/class_applicationGeneric.inc:96
 msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:107
+#: plugins/admin/applications/class_applicationGeneric.inc:116
 msgid "This 'dn' is no application."
 msgstr ""
 
+#: plugins/admin/applications/class_applicationGeneric.inc:203
+#, php-format
+msgid "Removing of application with dn '%s' failed."
+msgstr ""
+
 #: plugins/admin/applications/class_applicationGeneric.inc:215
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:222
+#, php-format
+msgid "Removing application from group '%s' failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:264
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:296
+#: plugins/admin/applications/class_applicationGeneric.inc:340
+msgid "Specified execute path must start with '/'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:354
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:301
+#: plugins/admin/applications/class_applicationGeneric.inc:359
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:305
+#: plugins/admin/applications/class_applicationGeneric.inc:363
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:309
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:318
+#: plugins/admin/applications/class_applicationGeneric.inc:382
+#: plugins/admin/applications/class_applicationGeneric.inc:390
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:254
+#: plugins/admin/applications/class_applicationGeneric.inc:421
+#, php-format
+msgid "Saving of application with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:446
+msgid "Application settings"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+msgid "Application generic"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+msgid "Script content"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:260
-#: plugins/admin/applications/class_applicationManagement.inc:286
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-msgid "new"
+#: plugins/admin/applications/class_divListApplication.inc:31
+msgid "List of Applications"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
-msgid "Create new application"
+#: plugins/admin/applications/class_divListApplication.inc:32
+msgid "This table displays all applications in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
+#: plugins/admin/applications/class_divListApplication.inc:36
+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/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/applications/class_divListApplication.inc:108
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
+msgid "new"
+msgstr ""
+
+#: plugins/admin/applications/class_divListApplication.inc:109
+msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
+#: plugins/admin/applications/release_select.tpl:3
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/mimetypes/release_select.tpl:3
+msgid "Branches"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
+#: plugins/admin/applications/release_select.tpl:9
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/mimetypes/release_select.tpl:9
+msgid "Current release"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
@@ -5252,11 +6886,12 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr ""
 
@@ -5265,35 +6900,44 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:122
+#: plugins/gofon/conference/generic.tpl:127
 msgid "Choose subtree to place department in"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:48
+#: plugins/admin/departments/generic.tpl:52
 msgid "State where this subtree is located"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:52
+#: plugins/admin/departments/generic.tpl:56
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:56
+#: plugins/admin/departments/generic.tpl:60
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:60
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:64
+#: plugins/admin/departments/generic.tpl:68
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/tabs_department.inc:29
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
+msgid "Administrative settings"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:83
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
+#: plugins/admin/departments/tabs_department.inc:34
+#: plugins/admin/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -5306,75 +6950,152 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:10 plugins/admin/systems/remove.tpl:10
-#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/acl/remove.tpl:10 plugins/admin/fai/remove.tpl:11
+#: plugins/gofon/conference/remove.tpl:10
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:8
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:176
+#: plugins/admin/departments/class_departmentGeneric.inc:172
+#, php-format
+msgid "Removing of department with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:183
-#: plugins/admin/departments/class_departmentGeneric.inc:185
+#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:193
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:198
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentGeneric.inc:242
+#, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:294
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:340
+#, php-format
+msgid "Saving of department with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:382
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:460
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
+#: ihtml/themes/default/snapshotdialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:199
-msgid " Please choose another name."
+#: plugins/admin/departments/class_departmentGeneric.inc:499
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:158
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+#: plugins/admin/departments/class_departmentManagement.inc:179
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/fai/class_faiManagement.inc:638
-msgid "Go to users home department"
+#: plugins/admin/departments/class_departmentManagement.inc:334
+msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:281
-msgid "Create new department"
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:289
-msgid "This table displays all departments, in the selected tree."
+#: plugins/admin/departments/class_divListDepartment.inc:33
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large number of departments, you might prefer the range selectors on top "
+"of the department list."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:298
-msgid "Department name"
+#: plugins/admin/departments/class_divListDepartment.inc:49
+msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:392
-msgid ".."
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/fai/class_divListFai.inc:123
+msgid "Go to users home department"
+msgstr ""
+
+#: plugins/admin/departments/class_divListDepartment.inc:74
+msgid "Create new department"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:1
@@ -5389,27 +7110,35 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:29
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:41
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:55
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/gofon/phoneaccount/generic.tpl:68
 msgid "Refresh"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:34
+#: plugins/admin/systems/network.tpl:50
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:272
-#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
+#: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:47
+#: plugins/admin/systems/network.tpl:63
 msgid "Dns records"
 msgstr ""
 
@@ -5419,11 +7148,11 @@ msgid "present"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:139
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-#: plugins/admin/systems/class_workstationStartup.inc:265
-#: plugins/admin/systems/class_workstationService.inc:131
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_terminalStartup.inc:151
+#: plugins/admin/systems/class_terminalGeneric.inc:230
+#: plugins/admin/systems/class_workstationStartup.inc:456
+#: plugins/admin/systems/class_workstationService.inc:241
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -5461,33 +7190,37 @@ msgid "Time Service"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/class_goLdapServer.inc:47
 msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
+#: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
+#: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
+#: plugins/admin/systems/goSyslogServer.tpl:1
 msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
+#: plugins/admin/systems/goCupsServer.tpl:1
 msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
-msgstr ""
-
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr ""
@@ -5571,6 +7304,8 @@ msgid "SSH service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
 msgid "Print service"
 msgstr ""
 
@@ -5591,156 +7326,383 @@ msgstr ""
 msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/class_winGeneric.inc:126
+#, php-format
+msgid "Removing of system wingeneric/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:523
+#: plugins/admin/systems/class_winGeneric.inc:164
 #: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_phoneGeneric.inc:314
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:391
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
+#: plugins/admin/systems/class_winGeneric.inc:224
+#, php-format
+msgid "Saving of system wingeneric/generic with dn '%s' failed."
+msgstr ""
+
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
+#: plugins/admin/systems/phonesettings.tpl:23
+#: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:36 plugins/admin/systems/server.tpl:34
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
 msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:44
+#: plugins/admin/systems/workstation.tpl:49
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:61
 msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:69
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: plugins/admin/systems/terminal.tpl:90
+#: plugins/admin/systems/workstation.tpl:69
+#: plugins/admin/ogroups/termgroup.tpl:14
 msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: plugins/admin/systems/terminal.tpl:92
+#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/ogroups/termgroup.tpl:16
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:115 plugins/admin/systems/server.tpl:50
+#: plugins/admin/systems/workstation.tpl:93
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/systems/terminal.tpl:119
+#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/ogroups/termgroup.tpl:79
 msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:83
-#: plugins/admin/systems/class_workstationService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_workstationStartup.inc:266
+#: plugins/admin/systems/class_workstationStartup.inc:284
+#: plugins/admin/systems/class_workstationStartup.inc:288
+#: plugins/admin/systems/class_workstationStartup.inc:758
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+msgid "inherited"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+msgid "bit"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:155
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:84
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:71
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:88
-#: plugins/admin/systems/class_workstationService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:77
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:78
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:187
-#: plugins/admin/systems/class_workstationService.inc:178
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+msgid "Bit"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:240
-#: plugins/admin/systems/class_workstationService.inc:245
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:359
+#: plugins/admin/systems/class_workstationService.inc:364
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:255
-#: plugins/admin/systems/class_workstationService.inc:260
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:374
+#: plugins/admin/systems/class_workstationService.inc:379
 msgid "Please specify a valid HSync range."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalService.inc:416
+#, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+msgid "Service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+msgid "Monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+msgid "Method"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+msgid "Gfx driver"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+msgid "Vsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:443
+msgid "Printer service enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+msgid "Scanner enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:446
+msgid "Scanner model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+msgid "Mouse type"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+msgid "Mouse port"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
+#, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:386
+#, php-format
+msgid "Saving of system terminal/startup with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:432
+msgid "Terminal startup"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+msgid "Ldap server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+msgid "Kernel paramenter"
+msgstr ""
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:54
 msgid "Select action to execute for this server"
 msgstr ""
 
@@ -5748,15 +7710,12 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:9
+#: plugins/admin/systems/workstation.tpl:8
 msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr ""
 
@@ -5768,494 +7727,614 @@ msgstr ""
 msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:31
+#: plugins/admin/systems/printer.tpl:36
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
+#: plugins/admin/systems/printer.tpl:39
 msgid "Printer location"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:38
+#: plugins/admin/systems/printer.tpl:43
 msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:51
 #: plugins/admin/systems/workstationService.tpl:86
 #: plugins/admin/systems/terminalService.tpl:86
 msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
 msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
 msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/printer.tpl:86
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/printer.tpl:87
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/class_terminalGeneric.inc:98
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:99
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
+#: plugins/admin/systems/class_terminalGeneric.inc:161
+#, php-format
+msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
+#: plugins/admin/systems/class_terminalGeneric.inc:167
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
+#: plugins/admin/systems/class_terminalGeneric.inc:179
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
+#: plugins/admin/systems/class_terminalGeneric.inc:191
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
+#: plugins/admin/systems/class_terminalGeneric.inc:264
+#: plugins/admin/systems/class_terminalGeneric.inc:268
+#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/ogroups/class_termgroup.inc:254
+msgid "Memory test"
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:265
 #: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_servGeneric.inc:167
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/ogroups/class_termgroup.inc:255
+msgid "System analysis"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+msgid "Wake up"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+#, php-format
+msgid "Removing of object system terminal/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:374
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
+#: plugins/admin/systems/class_terminalGeneric.inc:378
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/class_terminalGeneric.inc:401
+#: plugins/admin/systems/class_workstationGeneric.inc:371
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+#, php-format
+msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+msgid "Terminal generic"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+msgid "Syslog server enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+msgid "Ntp server settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+msgid "Action flag"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:45
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:162
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
+#: plugins/admin/systems/class_servGeneric.inc:111
+#, php-format
+msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/ogroups/class_termgroup.inc:250
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:171
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/ogroups/class_termgroup.inc:251
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/ogroups/class_termgroup.inc:252
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/ogroups/class_termgroup.inc:253
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/class_servGeneric.inc:188
+#, php-format
+msgid "Removing of system server/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/class_servGeneric.inc:224
+msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
+#: plugins/admin/systems/class_servGeneric.inc:231
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/class_servGeneric.inc:300
+#, php-format
+msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_servGeneric.inc:316
+msgid "Server generic"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+msgid "Goto mode"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
-msgid "You are not allowed to delete this component!"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
+#: plugins/admin/systems/class_workstationGeneric.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#, php-format
+msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#, php-format
+msgid "Removing of system workstation/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
+#: plugins/admin/systems/class_workstationGeneric.inc:344
+#: plugins/admin/ogroups/class_termgroup.inc:113
+msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
+#: plugins/admin/systems/class_workstationGeneric.inc:348
+msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
+#: plugins/admin/systems/class_workstationGeneric.inc:438
+#: plugins/admin/systems/class_workstationGeneric.inc:456
+#, php-format
+msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+msgid "Workstation generic"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:787
-#: plugins/admin/fai/class_faiManagement.inc:677
-msgid "This table displays all systems, in the selected tree."
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+msgid "Ntp server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
+#: plugins/admin/systems/class_systemManagement.inc:236
+msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
+#: plugins/admin/systems/class_systemManagement.inc:307
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:160
+#: plugins/admin/fai/class_faiManagement.inc:211
+msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
+#: plugins/admin/systems/class_systemManagement.inc:638
+msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
+#: plugins/admin/systems/class_systemManagement.inc:640
+msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
+#: plugins/admin/systems/class_systemManagement.inc:642
+msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
+#: plugins/admin/systems/class_systemManagement.inc:657
+msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
+#: plugins/admin/systems/class_systemManagement.inc:669
+msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
+#: plugins/admin/systems/class_systemManagement.inc:757
+msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-msgid "New System from incoming"
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:496
-msgid "Terminal"
+#: plugins/admin/systems/class_systemManagement.inc:762
+msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
+#: plugins/admin/systems/class_systemManagement.inc:766
+msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
+#: plugins/admin/systems/class_systemManagement.inc:768
+msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
+#: plugins/admin/systems/class_systemManagement.inc:769
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
+#: plugins/admin/systems/class_systemManagement.inc:770
+msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
+#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_divListSystem.inc:103
+msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
+#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/class_divListSystem.inc:105
+msgid "New Workstation"
 msgstr ""
 
 #: plugins/admin/systems/servdns.tpl:1
 msgid "Zones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
+#: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
+msgid "Postfix mydomain"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
+#: plugins/admin/systems/servkolab.tpl:73
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
+#: plugins/admin/systems/servkolab.tpl:81
 msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
+#: plugins/admin/systems/servkolab.tpl:89
 msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/servkolab.tpl:116
 msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
+#: plugins/admin/systems/servkolab.tpl:121
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
+#: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
+#: plugins/admin/systems/servkolab.tpl:141
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
+#: plugins/admin/systems/servkolab.tpl:157
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
+#: plugins/admin/systems/servkolab.tpl:168
 msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
+#: plugins/admin/systems/servkolab.tpl:188
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:176
+#: plugins/admin/systems/class_servDNS.inc:32
+msgid "Domain name system service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:73
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:177
+#: plugins/admin/systems/class_servDNS.inc:74
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:179
+#: plugins/admin/systems/class_servDNS.inc:76
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:180
+#: plugins/admin/systems/class_servDNS.inc:77
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:247
+#: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
+msgid "Reverse zone"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:167
+#: plugins/admin/fai/faiTemplateEntry.tpl:86
+msgid "Class"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:229
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:271
-msgid "Reverse zone"
+#: plugins/admin/systems/class_servDNS.inc:288
+#, php-format
+msgid "Updating of system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:273
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
-msgid "Class"
+#: plugins/admin/systems/class_servDNS.inc:297
+#, php-format
+msgid "Removing of system server/dns with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:318
+#, php-format
+msgid "Saving of system server/dns with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:342
+#, php-format
+msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
+#: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
+msgid "DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:401
+msgid "Primary dns server"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
+#: plugins/admin/systems/servdb.tpl:10 plugins/admin/systems/goKrbServer.tpl:4
 msgid "Kerberos Realm"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/goKrbServer.tpl:8
+#: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr ""
 
@@ -6263,23 +8342,26 @@ msgstr ""
 msgid "FAX database"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
 msgid "FAX DB user"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
 msgid "Asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
 msgid "Asterisk DB user"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
 msgid "Country dial prefix"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
 msgid "Local dial prefix"
 msgstr ""
 
@@ -6288,22 +8370,32 @@ msgid "IMAP admin access"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
 msgid "Logging database"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+#: plugins/admin/systems/goGlpiServer.tpl:4
+#: plugins/admin/systems/goLogDBServer.tpl:4
 msgid "Logging DB user"
 msgstr ""
 
@@ -6312,6 +8404,8 @@ msgid "Glpi database"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
+#: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr ""
 
@@ -6319,271 +8413,276 @@ msgstr ""
 msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
+#: plugins/admin/systems/class_goFaxServer.inc:79
 #, php-format
-msgid "The specified kerberos password is empty."
+msgid "Removing server services/gofax with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
+#: plugins/admin/systems/class_goFaxServer.inc:102
 #, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+msgid "Saving server services/gofax with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/class_goFaxServer.inc:215
+msgid "Fax server"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/class_goFaxServer.inc:216
+msgid "Fax server service"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/class_goFaxServer.inc:224
+msgid "Login name"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
+msgid ""
+"This includes all 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/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/class_servKolab.inc:99
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/class_servKolab.inc:105
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/class_servKolab.inc:191
+#: plugins/admin/systems/class_servKolab.inc:207
+#, php-format
+msgid "Removing host entry from system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/class_servKolab.inc:246
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/class_servKolab.inc:248
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/class_servKolab.inc:252
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
-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_servKolab.inc:260
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/class_servKolab.inc:332
+#, php-format
+msgid "Saving system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servKolab.inc:354
+msgid "Kolab mail service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/class_servKolab.inc:383
+#, php-format
+msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_servKolab.inc:414
+msgid "Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/class_servKolab.inc:423
+msgid "My destination"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/class_servKolab.inc:424
+msgid "FTP FreeBusy service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/class_servKolab.inc:427
+msgid "Relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/class_servKolab.inc:428
+msgid "HTTP FreeBusy service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
+#: plugins/admin/systems/class_printGeneric.inc:103
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/class_printGeneric.inc:232
+#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:245
+#: plugins/admin/systems/class_printGeneric.inc:284
+#: plugins/admin/systems/class_printGeneric.inc:300
+#: plugins/admin/systems/class_printGeneric.inc:303
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:245
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/class_printGeneric.inc:233
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:175
-#: plugins/admin/systems/class_printGeneric.inc:182
-#: plugins/admin/systems/class_printGeneric.inc:217
-#: plugins/admin/systems/class_printGeneric.inc:238
 #: plugins/admin/systems/class_printGeneric.inc:241
-msgid "Add printer extension"
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:176
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:183
+#: plugins/admin/systems/class_printGeneric.inc:246
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:218
+#: plugins/admin/systems/class_printGeneric.inc:277
+msgid "This 'dn' has no printer features."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:285
 msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:230
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:292
+#: plugins/admin/systems/class_printGeneric.inc:295
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:231
+#: plugins/admin/systems/class_printGeneric.inc:293
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:296
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:239
+#: plugins/admin/systems/class_printGeneric.inc:301
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:304
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:413
+#: plugins/admin/systems/class_printGeneric.inc:478
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:421
+#: plugins/admin/systems/class_printGeneric.inc:486
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:433
+#: plugins/admin/systems/class_printGeneric.inc:499
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:435
+#: plugins/admin/systems/class_printGeneric.inc:501
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:513
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/class_printGeneric.inc:552
+#, php-format
+msgid "Removing of system print/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:738
+#, php-format
+msgid "Saving of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:666
-#: plugins/admin/systems/class_printGeneric.inc:668
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: plugins/admin/systems/class_printGeneric.inc:755
+#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+msgid "Print generic"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+msgid "Printer PPD"
+msgstr ""
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -6599,15 +8698,90 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/class_componentGeneric.inc:101
+#, php-format
+msgid "Removing of system component/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:139
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
+msgid "The required field IP address is empty."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+msgid "The field IP address contains an invalid address."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:223
+#, php-format
+msgid "Saving of system component/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:234
+msgid "Component generic"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+msgid "Network device"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr ""
+
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
+msgstr ""
+
 #: plugins/admin/systems/glpiPrinter.tpl:9
 msgid "Printer type"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -6621,6 +8795,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -6629,10 +8804,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr ""
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr ""
@@ -6646,11 +8817,15 @@ msgid "Contacts"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr ""
 
@@ -6662,78 +8837,44 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
+msgid "Volume"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
+msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
+#: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
+msgid "Operating system"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -6778,86 +8919,205 @@ msgstr ""
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:116
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:117
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: plugins/admin/systems/class_phoneGeneric.inc:240
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+#, php-format
+msgid "Removing of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+#, php-format
+msgid "Saving of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+msgid "Phone generic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+msgid "Phone hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+msgid "Default ip"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:49
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:125
+#: plugins/admin/systems/class_servNfs.inc:179
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
+#: plugins/admin/systems/class_servNfs.inc:185
+msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
+#: plugins/admin/systems/class_servNfs.inc:188
+msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:139
+#: plugins/admin/systems/class_servNfs.inc:193
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:143
+#: plugins/admin/systems/class_servNfs.inc:197
+msgid "Volume contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/class_servNfs.inc:205
 msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:247
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:273
+msgid "Charset"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:391
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:436
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:303
+#: plugins/admin/systems/class_workstationStartup.inc:494
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:831
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:845
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1013
+#, php-format
+msgid "Saving of system workstation/startup with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1063
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1065
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+msgid "System startup"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+msgid "Kernel parameter"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+msgid "Debian release"
+msgstr ""
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr ""
@@ -6867,70 +9127,66 @@ msgid "Phone type"
 msgstr ""
 
 #: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/phonesettings.tpl:27
+#: plugins/admin/systems/phonesettings.tpl:37
+#: plugins/admin/systems/phonesettings.tpl:51
+#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/phonesettings.tpl:111
+#: plugins/admin/systems/phonesettings.tpl:158
 msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:11
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/phonesettings.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
+#: plugins/admin/systems/phonesettings.tpl:58
+#: plugins/admin/systems/phonesettings.tpl:95
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/phonesettings.tpl:77
 msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
+#: plugins/admin/systems/phonesettings.tpl:108
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
+#: plugins/admin/systems/phonesettings.tpl:118
 msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
+#: plugins/admin/systems/phonesettings.tpl:126
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
+#: plugins/admin/systems/phonesettings.tpl:134
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/phonesettings.tpl:147
 msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:153
+#: plugins/admin/systems/phonesettings.tpl:155
 msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
+#: plugins/admin/systems/phonesettings.tpl:170
 msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/phonesettings.tpl:185
 msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:205
+#: plugins/admin/systems/phonesettings.tpl:207
 msgid "MSN"
 msgstr ""
 
@@ -6950,62 +9206,85 @@ msgstr ""
 msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+msgid "Can't get ppd informations."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
 #, php-format
 msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid, can't read/write any ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
+msgid "Please specify a valid ppd file."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
 #, php-format
-msgid "There is already a ppd file for this kind of printer."
+msgid "Can't create file '%s' to store modifed ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
 #, php-format
-msgid "Can't save file '%s'."
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#, php-format
+msgid ""
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#, php-format
+msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
+#: plugins/admin/systems/class_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:319
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
@@ -7018,11 +9297,11 @@ msgstr ""
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr ""
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 msgid "Select"
 msgstr ""
 
@@ -7038,7 +9317,7 @@ msgstr ""
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/fai/headpage.tpl:82 plugins/admin/fai/faiProfileEntry.tpl:54
+#: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
 msgid "Display objects matching"
@@ -7047,15 +9326,29 @@ msgstr ""
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/fai/headpage.tpl:86 plugins/admin/fai/faiProfileEntry.tpl:59
+#: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
 msgid "Printer ppd selection."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:421
+#, php-format
+msgid "Saving of system workstation/service with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:430
+msgid "Workstation service"
+msgstr ""
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -7106,19 +9399,6 @@ msgstr ""
 msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-msgid "Telephone"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -7144,45 +9424,41 @@ msgstr ""
 msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/workstationService.tpl:125
+msgid "Use DDC for automatic detection"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/workstationService.tpl:128
 #: plugins/admin/systems/terminalService.tpl:124
 msgid "HSync"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/workstationService.tpl:130
 #: plugins/admin/systems/terminalService.tpl:126
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/workstationService.tpl:133
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/workstationService.tpl:135
 #: plugins/admin/systems/terminalService.tpl:131
 msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/workstationService.tpl:147
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/workstationService.tpl:148
 #: plugins/admin/systems/terminalService.tpl:204
 msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr ""
@@ -7192,68 +9468,63 @@ msgstr ""
 msgid "Boot parameters"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
+msgid "Custom options"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:22
 #: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+msgid "LDAP server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:37
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
 msgid "FAI server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:196
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:47
-#: plugins/admin/fai/faiPackageNew.tpl:35
-msgid "set"
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
+msgid "Assigned FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-msgid "Assigned FAI classes"
+#: plugins/admin/systems/workstationStartup.tpl:85
+msgid "set"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:116
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/workstationStartup.tpl:118
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
 
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr ""
+
 #: plugins/admin/systems/terminalStartup.tpl:35
 msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
@@ -7278,10 +9549,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr ""
@@ -7318,10 +9585,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -7330,51 +9593,75 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
+#: plugins/admin/fai/faiPackage.tpl:29
+msgid "Repository"
+msgstr ""
+
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:197
-#: plugins/admin/systems/class_servRepository.inc:218
+#: plugins/admin/systems/class_servRepository.inc:245
+#: plugins/admin/systems/class_servRepository.inc:266
 msgid "Sections"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
 msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
 msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
+msgid "Repository service"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/class_servRepository.inc:137
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_servRepository.inc:171
+#, php-format
 msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:162
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
-#: plugins/admin/fai/class_faiManagement.inc:324
-#: plugins/admin/fai/class_faiManagement.inc:430
+#: plugins/admin/systems/class_servRepository.inc:204
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
+#: plugins/admin/fai/class_faiManagement.inc:331
 msgid "This name is already in use."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:421
+#, php-format
+msgid "Set status flag for server services/repository with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:441
+msgid "Releases"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr ""
@@ -7387,6 +9674,48 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+msgid "Glpi server"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+msgid "Glpi server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+msgid "Admin"
+msgstr ""
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr ""
@@ -7429,12 +9758,15 @@ msgstr ""
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
 msgstr ""
 
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiAccount.inc:144
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:156
 msgid "There is no server with valid glpi database service."
@@ -7485,72 +9817,158 @@ msgstr ""
 msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:199
 msgid "Remove inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiAccount.inc:566
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
+#: plugins/admin/systems/class_glpiAccount.inc:568
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:202
 msgid "Add inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiAccount.inc:569
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
-msgid "File"
+#: plugins/admin/systems/class_glpiAccount.inc:769
+msgid "Inventory extension"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+msgid "Attachment name"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+msgid "Attachment comment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+msgid "Attachment mime type"
 msgstr ""
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+msgid "Attachment filename"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
+#: plugins/admin/systems/class_glpiAccount.inc:791
+msgid "Device monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+msgid "Device case"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+msgid "Device motherboard"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+msgid "Device soundcard"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+msgid "Device processor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+msgid "Device misc device"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+msgid "Device ram"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+msgid "Device hard disk drive"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+msgid "Device drive"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+msgid "Device controler"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+msgid "Device graphics card"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+msgid "Device power supply"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+msgid "Device pci device"
+msgstr ""
+
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30
+#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
+msgid "File"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr ""
+
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr ""
@@ -7682,6 +10100,7 @@ msgid "Add/Edit network interface"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr ""
 
@@ -7761,7 +10180,7 @@ msgid "New processor"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_faiManagement.inc:643
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "P"
 msgstr ""
 
@@ -7845,16 +10264,16 @@ msgstr ""
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
 msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
 msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "Other"
 msgstr ""
 
@@ -7867,7 +10286,9 @@ msgid "Website"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
@@ -7937,7 +10358,7 @@ msgstr ""
 msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 msgid "Please specify a valid name for this attachment."
 msgstr ""
 
@@ -8000,10 +10421,30 @@ msgstr ""
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
 msgid "since"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+msgid "Printer inventory extension"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+msgid "Supports serial interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+msgid "Supports parallel interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+msgid "Supports usb interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+msgid "Cartridge settings"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -8020,42 +10461,75 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:296
+#: plugins/admin/systems/class_termDNS.inc:132
+#, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:298
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:302
+#: plugins/admin/systems/class_termDNS.inc:305
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:308
+#: plugins/admin/systems/class_termDNS.inc:312
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:314
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:323
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:347
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:358
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:329
-#: plugins/admin/systems/class_servDNSeditZone.inc:199
+#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
+#: plugins/admin/systems/class_termDNS.inc:448
+#, php-format
+msgid "Saving of terminal/dns account with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:511
+msgid "DNS settings"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:519
+msgid "DNS records"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:522
+msgid "IP address"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
 msgid "The selected name is already in use."
 msgstr ""
 
@@ -8084,63 +10558,46 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:1
-msgid "Zone settings"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:17
-msgid "Subnet"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:27
-msgid "SOA record for this zone"
+msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:33
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:45
-msgid "Serial number (automatically incremented)"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:61
-#: 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/systems/servdnseditzone.tpl:67
-msgid "Expire"
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:91
-msgid "DNS TTL"
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:98
-msgid "DNS Class"
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:107
-msgid "Records"
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Global zone records"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -8148,57 +10605,73 @@ msgid "Choose a system type"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
+msgid "Choose an object group as template"
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+msgid "Choose an object group"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
+#: plugins/admin/ogroups/phonequeue.tpl:18
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
+msgid "Down"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:149
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
 msgid "This zoneName is already in use"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:152
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
 msgid "This reverse zone is already in use"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:157
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, php-format
+msgid "Please choose a valid zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, php-format
+msgid "Please choose a valid reverse zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
 msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:161
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
 msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:165
-#: plugins/admin/systems/class_servDNSeditZone.inc:169
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
 msgid ""
 "Your mail address contains '@' replace this with '.' to enable GOsa to "
 "create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:173
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
 msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:181
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:185
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:189
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
 msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:193
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
@@ -8206,936 +10679,2026 @@ msgstr ""
 msgid "Choose a base"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
 msgid ""
 "Step in the prefered tree and click save to use the current subtree as base. "
 "Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, php-format
 msgid "Select this base"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:24
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#, php-format
 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."
+"Can't rename '%s' to '%s' there is already an entry with the same name in "
+"our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#, php-format
+msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, php-format
+msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:33
-msgid "Member objects"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:150
-msgid "Phone queue"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#: plugins/admin/ogroups/tabs_ogroups.inc:130
-msgid "Terminals"
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
+#: plugins/admin/systems/class_divListSystem.inc:42
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
 msgstr ""
 
+#: plugins/admin/systems/class_divListSystem.inc:67
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/systems/class_divListSystem.inc:76
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
+#: plugins/admin/systems/class_divListSystem.inc:103
+msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
+#: plugins/admin/systems/class_divListSystem.inc:105
+msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
+#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/systems/class_divListSystem.inc:107
+msgid "New Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
+#: plugins/admin/systems/class_divListSystem.inc:108
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:225
-#, php-format
-msgid "You're about to delete the object group '%s'."
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:231
-#: plugins/admin/ogroups/class_ogroupManagement.inc:257
-msgid "You are not allowed to delete this object group!"
+#: plugins/admin/systems/class_divListSystem.inc:131
+msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-msgid "Create new object group"
+#: plugins/admin/systems/class_divListSystem.inc:132
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
-msgid "Name of object groups"
+#: plugins/admin/systems/class_divListSystem.inc:133
+msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: plugins/admin/systems/class_divListSystem.inc:134
+msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:144
-msgid "This 'dn' is no object group."
+#: plugins/admin/systems/class_divListSystem.inc:135
+msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:279
-msgid "too many different objects!"
+#: plugins/admin/systems/class_divListSystem.inc:136
+msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:281
-msgid "users"
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:282
-msgid "groups"
+#: plugins/admin/systems/class_divListSystem.inc:138
+msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:283
-msgid "applications"
+#: plugins/admin/systems/class_divListSystem.inc:139
+msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
-msgid "departments"
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:285
-msgid "servers"
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/acl/class_divListACL.inc:123
+msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
-msgid "workstations"
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/acl/class_divListACL.inc:126
+msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
-msgid "terminals"
+#: plugins/admin/systems/class_divListSystem.inc:189
+msgid "Set root       password"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
-msgid "phones"
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
-msgid "printers"
+#: plugins/admin/systems/ServiceAddDialog.tpl:7
+msgid ""
+"This dialog allows you to add new services to the currenty edited server "
+"object. The box below shows all available but not already used services."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-msgid "and"
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
+msgid "Service to add"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+msgid "All available services are already in use."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
-msgid "There is already an object with this cn."
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
-msgid "You can combine two different object types at maximum only!"
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
 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/systems/class_goCupsServer.inc:122
+#, php-format
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
+#: plugins/admin/systems/class_goCupsServer.inc:206
+msgid "Cups"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
+#: plugins/admin/systems/class_goCupsServer.inc:207
+msgid "Cups service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
-msgid "Generic queue Settings"
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:287
-msgid "Down"
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:46
-msgid "Timeout"
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:62
-msgid "Strategy"
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+msgid "Installed services"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
+#: plugins/admin/systems/class_divListSystemService.inc:22
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
+#: plugins/admin/systems/class_divListSystemService.inc:30
+msgid "Service name"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add new service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
-msgid "Welcome sound file"
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
-msgid "Announce message"
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all services"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+msgid "Stop service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
+#: plugins/admin/systems/class_divListSystemService.inc:56
+msgid "Stop all services"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+msgid "Restart service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
-msgid "'Thank you' message"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+msgid "Restart all services"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
+#: plugins/admin/systems/class_divListSystemService.inc:86
+msgid "Stopped"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
+#: plugins/admin/systems/class_divListSystemService.inc:87
+msgid "Started"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
+#: plugins/admin/systems/class_divListSystemService.inc:88
+msgid "Restarting"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
-msgid "Less Than sound file"
+#: plugins/admin/systems/class_divListSystemService.inc:89
+msgid "User status"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
-msgid "Phone attributes "
+#: plugins/admin/systems/class_divListSystemService.inc:100
+msgid "Start service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/admin/systems/class_divListSystemService.inc:118
+msgid "Edit service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
+#: plugins/admin/systems/class_divListSystemService.inc:124
+msgid "Remove service"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:41
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
-msgid "ring all"
+#: plugins/admin/systems/class_goNtpServer.inc:122
+#, php-format
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "round robin"
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-msgid "least recently called"
+#: plugins/admin/systems/class_goNtpServer.inc:219
+msgid "NTP"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
-msgid "fewest completed calls"
+#: plugins/admin/systems/class_goNtpServer.inc:228
+msgid "Ntp source"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid "random"
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid "round robin with memory"
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
-msgid "Remove the phone queue from this Account"
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:116
-msgid "Create phone queue"
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:117
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/class_goLdapServer.inc:211
+msgid "Ldap service"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
-msgid "Timeout must be numeric"
+#: plugins/admin/systems/class_goLdapServer.inc:219
+msgid "Ldap base"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
-msgid "Retry must be numeric"
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
-msgid "Max queue length must be numeric"
+#: plugins/admin/systems/goMailServer.tpl:10
+msgid "The full qualified host name."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
-msgid "Announce frequency must be numeric"
+#: plugins/admin/systems/goMailServer.tpl:14
+msgid "Max mail header size"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-msgid "There must be least one queue number defined."
+#: plugins/admin/systems/goMailServer.tpl:18
+msgid "This value specifies the maximal header size."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
-msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
+#: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
+msgid "Max mailbox size"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
-#, php-format
-msgid ""
-"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:248
-#: plugins/admin/ogroups/class_phonequeue.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
-#, php-format
-msgid "Can't select database %s on %s."
+#: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
+msgid "Max message size"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:660
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
-#: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
+msgid "Relay host"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:614
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
-#: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/systems/goMailServer.tpl:42
+msgid "Relay messages to following host:"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/faiHook.tpl:32
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-msgid "Objects"
+#: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
+msgid "Local networks"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
+#: plugins/admin/systems/goMailServer.tpl:52
+msgid "Postfix networks"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: plugins/admin/systems/goMailServer.tpl:66
+msgid "Domains and routing"
 msgstr ""
 
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
-msgid "Fully Automatic Installation"
+#: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
+msgid "Domains to accept mail for"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:215
-#: plugins/admin/fai/class_faiScriptEntry.inc:83
-#: plugins/admin/fai/class_faiHook.inc:238
-#: plugins/admin/fai/class_faiHookEntry.inc:77
-msgid "Download"
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:32
-msgid "FAI"
+#: plugins/admin/systems/goMailServer.tpl:89
+msgid "Transports"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:33
-msgid "Fully Automatic Installation - management"
+#: plugins/admin/systems/goMailServer.tpl:92
+msgid "Select a transport protocol."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:228
-#, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
+#: plugins/admin/systems/goMailServer.tpl:105
+msgid "Restrictions"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:318
-#: plugins/admin/fai/class_faiManagement.inc:424
-msgid "Specified branch name is invalid."
+#: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
+msgid "Restrictions for sender"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:378
-#, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+msgid "Restriction filter"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:381
-msgid "You are not allowed to delete this release!"
+#: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
+msgid "Restrictions for recipient"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:643
-msgid "New profile"
+#: plugins/admin/systems/goMailServer.tpl:149
+#: plugins/admin/systems/goImapServer.tpl:76
+msgid "The server must be saved before you can use the status flag."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:648
-msgid "New partition table"
+#: plugins/admin/systems/goMailServer.tpl:151
+#: plugins/admin/systems/goImapServer.tpl:78
+msgid "The service must be saved before you can use the status flag."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:648
-msgid "PT"
+#: plugins/admin/systems/goMailServer.tpl:154
+#: plugins/admin/systems/goImapServer.tpl:81
+msgid "Set new status"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
-msgid "New scripts"
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+msgid "Set status"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:651
-msgid "S"
+#: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
+msgid "Start IMAP service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
-msgid "New hooks"
+#: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
+msgid "Start IMAP SSL service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
-msgid "H"
+#: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
+msgid "Start POP3 service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
-msgid "New variables"
+#: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
+msgid "Start POP3 SSL service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
-msgid "V"
+#: plugins/admin/systems/class_goSyslogServer.inc:26
+msgid "Logging service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
-msgid "New templates"
+#: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
+msgid "Syslog service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:660
-msgid "T"
+#: plugins/admin/systems/class_goSyslogServer.inc:76
+#, php-format
+msgid "Removing server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
-msgid "New package list"
+#: plugins/admin/systems/class_goSyslogServer.inc:94
+#, php-format
+msgid "Saving server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:663
-msgid "PK"
+#: plugins/admin/systems/class_goSyslogServer.inc:121
+#, php-format
+msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:681
-msgid "Name of FAI class"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+msgid "Syslog"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:682
-msgid "Class type"
+#: plugins/admin/systems/class_goFonServer.inc:32
+msgid "VoIP service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:686
-msgid "Edit class"
+#: plugins/admin/systems/class_goFonServer.inc:82
+#, php-format
+msgid "Removing server services/gofon with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:687
-msgid "Delete class"
+#: plugins/admin/systems/class_goFonServer.inc:100
+#, php-format
+msgid "Saving server services/gofon with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:728
-#: plugins/admin/fai/class_faiManagement.inc:729
-#: plugins/admin/fai/class_faiProfile.inc:280
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
-msgid "Partition table"
+#: plugins/admin/systems/class_goFonServer.inc:127
+#, php-format
+msgid "Set status flag for server services/gofon with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:735
-#: plugins/admin/fai/class_faiManagement.inc:736
-msgid "Package list"
+#: plugins/admin/systems/class_goFonServer.inc:137
+#, php-format
+msgid "The attribute DB user is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:742
-#: plugins/admin/fai/class_faiManagement.inc:743
-msgid "Scripts"
+#: plugins/admin/systems/class_goFonServer.inc:143
+#, php-format
+msgid ""
+"The attribute local dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:763
-#: plugins/admin/fai/class_faiManagement.inc:764
-msgid "Profile"
+#: plugins/admin/systems/class_goFonServer.inc:146
+#, php-format
+msgid ""
+"The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:6
-msgid "List of FAI classes"
+#: plugins/admin/systems/class_goFonServer.inc:224
+msgid "GoFon server"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
+#: plugins/admin/systems/class_goFonServer.inc:225
+msgid "GoFon server service"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:29
-msgid "Branches"
+#: plugins/admin/systems/class_goFonServer.inc:235
+msgid "Area code"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:35
-msgid "Current release"
+#: plugins/admin/systems/class_goFonServer.inc:236
+msgid "Country code"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
+#: plugins/admin/systems/class_goLogDBServer.inc:79
+#, php-format
+msgid "Removing server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
+#: plugins/admin/systems/class_goLogDBServer.inc:97
+#, php-format
+msgid "Saving server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:56
-msgid "Delete current release"
+#: plugins/admin/systems/class_goLogDBServer.inc:124
+#, php-format
+msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:71
-msgid "Show profiles"
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+msgid "Log"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:73
-msgid "Show scripts"
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+msgid "Log service"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:74
-msgid "Show hooks"
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:75
-msgid "Show variables"
+#: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
+msgid "Kerberos service"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:76
-msgid "Show packages"
+#: plugins/admin/systems/class_goKrbServer.inc:49
+msgid "Kerberos kadmin access informations"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:77
-msgid "Show partitions"
+#: plugins/admin/systems/class_goKrbServer.inc:79
+#, php-format
+msgid "Removing server services/gokrb with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. 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_goKrbServer.inc:97
+#, php-format
+msgid "Saving server services/gokrb with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-msgid "Discs"
+#: plugins/admin/systems/class_goKrbServer.inc:124
+#, php-format
+msgid "Set status flag for server services/gokrb with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/systems/class_goKrbServer.inc:135
+#, php-format
+msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:6
-msgid "List of FAI objects (Fully Automatic Installation)"
+#: plugins/admin/systems/class_goKrbServer.inc:138
+#, php-format
+msgid "The specified kerberos admin is empty."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:26
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
+#: plugins/admin/systems/class_goKrbServer.inc:141
+#, php-format
+msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:39
-msgid "Show only classes with templates"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+msgid "Realm"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:41
-msgid "Show only classes with scripts"
+#: plugins/admin/systems/class_goMailServer.inc:44
+msgid "Mail service (SMTP)"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:43
-msgid "Show only classes with hooks"
+#: plugins/admin/systems/class_goMailServer.inc:482
+msgid "Postfix"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:45
-msgid "Show only classes with variables"
+#: plugins/admin/systems/class_goMailServer.inc:512
+#, php-format
+msgid "Removing server services/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:47
-msgid "Show only classes with packages"
+#: plugins/admin/systems/class_goMailServer.inc:580
+#, php-format
+msgid "Saving server services/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:49
-msgid "Show only classes with partitions"
+#: plugins/admin/systems/class_goMailServer.inc:608
+#, php-format
+msgid "Set status flag for server services/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:62
-#: plugins/admin/fai/class_faiHookEntry.inc:64
-msgid "Please select a valid file."
+#: plugins/admin/systems/class_goMailServer.inc:619
+msgid "Please specify a numeric value for header size limit."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:65
-#: plugins/admin/fai/class_faiHookEntry.inc:67
-msgid "Selected file is empty."
+#: plugins/admin/systems/class_goMailServer.inc:623
+msgid "Please specify a numeric value for mailbox size limit."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:117
-#: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:130
-#: plugins/admin/fai/class_faiTemplateEntry.inc:164
-msgid "Please enter a name."
+#: plugins/admin/systems/class_goMailServer.inc:627
+msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:121
-msgid "Please enter a script."
+#: plugins/admin/systems/class_goMailServer.inc:774
+msgid "Mail service"
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/fai/faiScriptEntry.tpl:48
-msgid "Script attributes"
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
-msgid "Choose a priority"
+#: plugins/admin/systems/class_goMailServer.inc:789
+msgid "Transport table"
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:63
-#: plugins/admin/fai/faiHookEntry.tpl:63
-msgid "Import script"
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:291
-msgid "Please select a least one Package."
+#: plugins/admin/systems/class_goImapServer.inc:48
+msgid "IMAP/POP3 service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:295
-msgid "Please choose a valid combination for your repository setup."
+#: plugins/admin/systems/class_goImapServer.inc:53
+msgid "Repair database"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:316
-msgid "package is configured"
+#: plugins/admin/systems/class_goImapServer.inc:83
+msgid "Cyrus service"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/systems/class_goImapServer.inc:112
 #, php-format
-msgid "Package file '%s' does not exist."
+msgid "Removing server services/imap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:55
-msgid "Used packages"
+#: plugins/admin/systems/class_goImapServer.inc:130
+#, php-format
+msgid "Saving server services/imap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:57
-msgid "Choosen packages"
+#: plugins/admin/systems/class_goImapServer.inc:158
+#, php-format
+msgid "Set status flag for server services/imap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:63 include/functions.inc:595
-msgid "Configure"
+#: plugins/admin/systems/class_goImapServer.inc:168
+msgid "Please specify a server identifier."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:272
+#: plugins/admin/systems/class_goImapServer.inc:171
+msgid "Please specify a connect url."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:174
+msgid "Please specify an admin user."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:177
+msgid "Please specify a password for the admin user."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:182
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:273
+msgid "Imap"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+msgid "Imap service"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr ""
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:31
+msgid "File service"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:178
+#, php-format
+msgid "Removing of system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:212
+#, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:239
+#, php-format
+msgid "Set status flag for system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:287
+#, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:301
+#, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:312
+#, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:449
+msgid "Share service"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+msgid "Share entry"
+msgstr ""
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr ""
+
+#: plugins/admin/ogroups/termgroup.tpl:2
+msgid ""
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:37
+msgid "Member objects"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:166
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
+msgid "System"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:146
+msgid "Terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:118
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:343
+#, php-format
+msgid "Removing of object group/workstation with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:350
+msgid "System group"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Select to see applications"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Show applications"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Select to see terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Select to see printers"
+msgstr ""
+
+#: 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/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:144
+msgid "This 'dn' is no object group."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:279
+msgid "too many different objects!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:281
+msgid "users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:282
+msgid "groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:283
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:284
+msgid "departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:285
+msgid "servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:286
+msgid "workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:287
+msgid "terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:288
+msgid "phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:289
+msgid "printers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:296
+msgid "and"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
+msgid "Non existing dn:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:649
+msgid "There is already an object with this cn."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:666
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:715
+#, php-format
+msgid "Saving of object group/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:728
+#, php-format
+msgid "Removing of object group/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:754
+msgid "Object group generic"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+msgid "Member"
+msgstr ""
+
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/ogroups/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
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
+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:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
+msgid "Timeout"
+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
+#: plugins/admin/ogroups/class_phonequeue.inc:726
+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"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
+msgstr ""
+
+#: 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
+#: plugins/admin/ogroups/class_phonequeue.inc:739
+msgid "Announce holdtime"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
+msgid "Allow the called user to transfer his call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
+msgid "Allows calling user to transfer call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
+msgid "Allows calling to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
+msgid "Ring instead of playing background music"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:41
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:98
+#, php-format
+msgid "Saving of object group/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:131
+#, php-format
+msgid "Removing of object group/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+msgid "Mail group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:79
+msgid "ring all"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:80
+msgid "round robin"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:81
+msgid "least recently called"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:82
+msgid "fewest completed calls"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+msgid "random"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "round robin with memory"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+msgid "Remove the phone queue from this Account"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:114
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:116
+msgid "Create phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:117
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:201
+msgid "Timeout must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:204
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:207
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:210
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:227
+msgid ""
+"There is currently no asterisk server defined. Your settings can't be saved."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:240
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
+#, php-format
+msgid ""
+"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/macro/class_gofonMacro.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:661
+#, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:525
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+#, php-format
+msgid "Saving of object group/phone queue with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/macro/class_gofonMacro.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:684
+#, php-format
+msgid "Removing of object group/phone queue with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+msgid "Phone group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+msgid "Max queue lenght"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+msgid " Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+msgid "Welcome music"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+msgid "'Thank you' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+msgid "'Second' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+msgid "Queue phone number"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+msgid "Announce"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
+msgid "List of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
+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/class_divListOGroup.inc:58
+msgid "Name of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Select to see groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Select to see groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Show groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Select to see groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Show groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Select to see groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Show groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Select to see groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Show groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Select to see groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Show groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Select to see groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Show groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Select to see groups containing printer"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Show groups containing printer"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Select to see groups containing phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Show groups containing phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+msgid "Create new object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:178
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:25
+msgid "ACLs"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:159
+#, php-format
+msgid "You're about to delete the acl %s."
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:165
+#: plugins/admin/acl/class_aclManagement.inc:191
+msgid "You are not allowed to delete this acl!"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:31
+msgid "List of acl"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:32
+msgid "List of acls"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:36
+msgid "This menu allows you to edit and delete selected acls."
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:61
+msgid "Display acls matching"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:109
+msgid "Acl"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:153
+msgid "Select to display users"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:153
+msgid "Display user"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:155
+msgid "Select to display departments"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:155
+msgid "Display departments"
+msgstr ""
+
+#: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
+msgid "ACL management"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+msgid "Objects"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
+msgid "Fully Automatic Installation"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:364
+#, php-format
+msgid "Creating of FAI/script with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+msgid "FAI script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:460
+msgid "Script priority"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:336
+#, php-format
+msgid "Saving of FAI/template with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:415
+msgid "FAI template"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+msgid "Template file"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+msgid "Template path"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+msgid "File owner"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+msgid "File permissions"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
+msgid "FAI"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:34
+msgid "Fully Automatic Installation - management"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:154
+#, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:204
+#, php-format
+msgid ""
+"Release cleanup : Removing object (tagged as remvoed) that is no longer in "
+"use '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:264
+#, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:267
+msgid "You are not allowed to delete this release!"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:322
+msgid "Specified branch name is invalid."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:324
+msgid "Specified freeze name is invalid."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+msgid "FAI management"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:65
+msgid "Used packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:67
+msgid "Choosen packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+msgid "Configure"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:74
+msgid "Toggle remove flag"
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. 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/fai/faiPartitionTable.tpl:34
+msgid "Discs"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:6
+msgid "List of FAI objects (Fully Automatic Installation)"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:26
+msgid ""
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:39
+msgid "Show only classes with templates"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:41
+msgid "Show only classes with scripts"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:43
+msgid "Show only classes with hooks"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:45
+msgid "Show only classes with variables"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:47
+msgid "Show only classes with packages"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:49
+msgid "Show only classes with partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:68
+#: plugins/admin/fai/class_faiHookEntry.inc:71
+msgid "Please select a valid file."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:71
+#: plugins/admin/fai/class_faiHookEntry.inc:74
+msgid "Selected file is empty."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:133
+#: plugins/admin/fai/class_faiVariableEntry.inc:102
+#: plugins/admin/fai/class_faiHookEntry.inc:147
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+msgid "Please enter a name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
+msgid "Please enter a script."
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/admin/fai/faiScriptEntry.tpl:48
+msgid "Script attributes"
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+msgid "Choose a priority"
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:63
+#: plugins/admin/fai/faiHookEntry.tpl:63
+msgid "Import script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:392
+msgid "Please select a least one Package."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:396
+msgid "Please choose a valid combination for your repository setup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:417
+msgid "package is configured"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:423
+msgid "Package marked for removal"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:450
+#, php-format
+msgid "Package file '%s' does not exist."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:494
+#, php-format
+msgid "Saving of FAI/package list with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+msgid "FAI Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+msgid "Install Method"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:275
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:276
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:277
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:278
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:279
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:283
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+msgid "Partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:351
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:355
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:363
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
+#: plugins/admin/fai/class_faiProfile.inc:420
+#: plugins/admin/fai/class_faiProfile.inc:424
+#, php-format
+msgid "Saving of FAI/profile with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:432
+msgid "Profile"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+msgid "FAI profile"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:392
+#, php-format
+msgid "Saving of FAI/hook with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:475
+msgid "FAI hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+msgid "primary"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+msgid "logical"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
+#: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiSummaryTab.inc:307
 msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
+#: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:374
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:389
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -9157,51 +12720,81 @@ msgstr ""
 msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
+#: plugins/admin/fai/class_faiVariableEntry.inc:98
+msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:82
-msgid "Please specify a value for the attribute 'content'."
+#: plugins/admin/fai/faiVariableEntry.tpl:29
+msgid "Variable attributes"
+msgstr ""
+
+#: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
+msgid "Variable content"
+msgstr ""
+
+#: plugins/admin/fai/faiTemplate.tpl:31
+msgid "List of template files"
+msgstr ""
+
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr ""
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr ""
+
+#: plugins/admin/fai/faiHook.tpl:34
+msgid "List of hook scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:284
+#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#, php-format
+msgid "%s partition"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:286
+#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#, php-format
+msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
+#: plugins/admin/fai/class_faiPartitionTable.inc:375
+#, php-format
+msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-msgid "Variable content"
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+msgid "FAI partition table"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:31
-msgid "List of template files"
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+msgid "Partition type"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:37
-msgid "Choose a template to delete or edit"
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+msgid "Partition no."
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:34
-msgid "List of hook scripts"
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+msgid "File system type"
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:42
-msgid "Choose a hook to delete or edit"
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+msgid "Partition size"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:231
-#: plugins/admin/fai/class_faiPartitionTable.inc:237
-#, php-format
-msgid "%s partition"
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+msgid "File system options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:233
-#: plugins/admin/fai/class_faiPartitionTable.inc:239
-#, php-format
-msgid "%s partition(s)"
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+msgid "Partition flags"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:126
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr ""
 
@@ -9218,51 +12811,47 @@ msgstr ""
 msgid "Hook attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:85
 msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:86
 msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:79
+#: plugins/admin/fai/class_askClassName.inc:87
 msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:80
+#: plugins/admin/fai/class_askClassName.inc:88
 msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_askClassName.inc:89
 msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_askClassName.inc:90
 msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_askClassName.inc:91
 msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_askClassName.inc:92
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:137
+#: plugins/admin/fai/class_askClassName.inc:146
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:141
+#: plugins/admin/fai/class_askClassName.inc:150
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -9297,36 +12886,45 @@ msgstr ""
 msgid "A new class name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:74
+#: plugins/admin/fai/class_faiVariable.inc:304
+#, php-format
+msgid "Saving of FAI/variable with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:383
+msgid "FAI variable"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:76
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:156
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:160
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:168
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:171
+#: plugins/admin/fai/class_faiTemplateEntry.inc:199
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:175
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr ""
 
@@ -9343,7 +12941,8 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
@@ -9405,77 +13004,428 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:1
+msgid "Repository settings"
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:3
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:5
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:14
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:26
+msgid "please choose a release..."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:37
+msgid "Sections for this release"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:11
+msgid "Please enter a name for the branch"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr ""
+
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. 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/fai/class_faiSummaryTab.inc:39
+msgid "Scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:184
+msgid "This object has no FAI classes assigned."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:196
+msgid "Open"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:303
+msgid "No."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:305
+msgid "FS options"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:21
+msgid "Create new branch"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:25
+msgid "Create new locked branch"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:30
+msgid "Delete current release"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:43
+msgid "List of FAI classes"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:44
+msgid "This table displays all FAI classes, in the selected tree."
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:48
+msgid "This menu allows you to create, delete and edit FAI classes."
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:64
+msgid "Name of FAI class"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Class type"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI profile objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Show profiles"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Display FAI template objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Display FAI scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Show scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:71
+msgid "Display FAI hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:71
+msgid "Show hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:72
+msgid "Display FAI variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:72
+msgid "Show variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Display FAI packages"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Show packages"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Display FAI partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Show partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:131
+msgid "New profile"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "New partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "New scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "S"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "New hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "New variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "New templates"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "New package list"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:222
+#: plugins/admin/fai/class_divListFai.inc:227
+msgid "Edit class"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:230
+msgid "Delete class"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/paste_generic.tpl:13
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:148
+msgid "Mime type"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:16
+#: plugins/admin/mimetypes/paste_generic.tpl:16
+msgid "Please enter a name for the mime type here"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
+msgid "Mime group"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:24
+msgid "Categorize this mime type"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:34
+msgid "Please sepecify a description"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:66
+msgid "Update mime type icon"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:79
+msgid "Left click"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
+msgid "File patterns"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:86
+msgid "Please specify a new file pattern"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:87
+msgid "Add a new file pattern"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:92
+#: plugins/admin/mimetypes/generic.tpl:133
+msgid "Enter an application name here"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
+msgid "Add application"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:103
+msgid "Embedding"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:114
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:119
+msgid "Show file in external viewer"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:124
+msgid "Ask whether to save to local disk"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:434
+#, php-format
+msgid "Saving of mime type/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#, php-format
+msgid "Removing of mime type/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:455
+#, php-format
+msgid "Removing mime type from objectgroup '%s' failed"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:465
+msgid "Please specify a valid name for this mime type."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:468
+msgid "Please specify at least one file pattern."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:481
+msgid "There's already a mime type with this 'Name'."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:489
+msgid "There's already an mime with this 'Name'."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:501
+msgid "You have no permissions to create a mime type on this 'Base'."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+msgid "Mime type generic"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
+msgid "Mime types"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+msgid "Left click action"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
-#, php-format
-msgid "Debconf information for package '%s'"
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+msgid "Embedded applications"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
-msgid "Repository settings"
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
+msgid "Manage mime types"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#, php-format
+msgid "You're about to delete the mime type '%s'."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:290
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:319
+msgid "You are not allowed to delete this mime type!"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
+#: plugins/admin/mimetypes/paste_generic.tpl:24
+msgid "Please sepecify a description for this mime type here"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:36
+msgid "List of defined mime types"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:37
+msgid ""
+"This menu allows you to add, edit and remove selected mime types. You may "
+"want to use the range selector on top of the mime type listbox, when working "
+"with a large number of mime types."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
-msgid "Sections for this release"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
+msgid "Mime type name"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:3
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:62
+msgid "Display mime types matching"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:9
-msgid "Please enter a name for the branch"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:118
+msgid "Create new mime type"
 msgstr ""
 
-#: plugins/admin/fai/remove_branch.tpl:6
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+#: plugins/admin/mimetypes/main.inc:42 plugins/admin/mimetypes/main.inc:44
+msgid "Mimetype management"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 msgid "Phone PIN"
 msgstr ""
 
@@ -9484,129 +13434,170 @@ msgstr ""
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
 "can't be saved to asterisk database."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:800
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:894
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:907
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:914
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-msgid "Stop"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+#, php-format
+msgid "Saving of user/phone account with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
+msgid ""
+"Can't remove phone account, the mysql extension is not present in php "
+"configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1110
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+#, php-format
+msgid "Removing of user/phone account with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+msgid "Phone account settings"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+msgid "Delivery mode"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+msgid "Telephone pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voivemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+msgid "Telephone number"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+msgid "Macro settings"
+msgstr ""
+
 #: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr ""
 
 #: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
 msgid "List of macros"
 msgstr ""
 
 #: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/macro/class_divListMacros.inc:36
 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 "
@@ -9622,6 +13613,7 @@ msgid "Display macros  matching"
 msgstr ""
 
 #: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/class_divListMacros.inc:60
 msgid "Regular expression for matching macro names"
 msgstr ""
 
@@ -9637,11 +13629,11 @@ msgstr ""
 msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/generic.tpl:48
 msgid "Visible for user"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/generic.tpl:57
 msgid "Macro text"
 msgstr ""
 
@@ -9649,104 +13641,104 @@ msgstr ""
 msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
 #, 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
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
 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:103
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:197
 msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:187
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:209
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#, php-format
+msgid "Removing of goFonMacro/generic account with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:222
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:261
+#: plugins/gofon/macro/class_gofonMacro.inc:292
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
-#: plugins/gofon/macro/class_gofonMacro.inc:296
+#: plugins/gofon/macro/class_gofonMacro.inc:319
+#: plugins/gofon/macro/class_gofonMacro.inc:327
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:341
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:357
+#: plugins/gofon/macro/class_gofonMacro.inc:389
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:394
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:366
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:371
+#: plugins/gofon/macro/class_gofonMacro.inc:403
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:377
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 msgid "Please choose a valid  base."
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:457
+#, php-format
+msgid "Saving of goFonMacro/generic account with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+msgid "Asterisk macro management"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+msgid "Macro content"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr ""
@@ -9771,32 +13763,69 @@ msgstr ""
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr ""
 
+#: plugins/gofon/macro/class_divListMacros.inc:52
+msgid "macro name"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:53
+msgid "Visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:90
+msgid "Create new phone macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:129
+msgid "Edit macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:132
+msgid "Delete macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:115
+msgid "Macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:116
+msgid "visible"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:117
+msgid "invisible"
+msgstr ""
+
 #: plugins/gofon/conference/headpage.tpl:6
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
 msgid "List of conference rooms"
 msgstr ""
 
 #: plugins/gofon/conference/headpage.tpl:24
+#: plugins/gofon/conference/class_divListConferences.inc:36
 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 "
@@ -9820,104 +13849,150 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:66
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
+#: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:113
+#: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
+#: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:149
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:150
+#: plugins/gofon/conference/generic.tpl:155
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:156
+#: plugins/gofon/conference/generic.tpl:161
 msgid "Count users"
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#, php-format
+msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
+msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:228
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
-msgid "Please enter a PIN."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#, php-format
+msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
-msgid "Please enter a name for the conference."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+msgid "Phone conference management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
-msgid "Only numeric chars are allowed in Number field."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
-msgid "Only numbers are allowed in Lifetime."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+msgid "Conference PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+msgid "Activate menu"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+msgid "Count user"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+msgid "Conference type"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+msgid "Format"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr ""
 
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Name - Number"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:61
+msgid "Regular expression for matching conference names"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "Create new conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "New conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:154
+msgid "Conference"
+msgstr ""
+
 #: plugins/gofon/fonreports/contents.tpl:31
 msgid "Source"
 msgstr ""
@@ -9934,7 +14009,10 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/fonreports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr ""
 
@@ -9942,16 +14020,16 @@ msgstr ""
 msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
+#: plugins/gofon/fonreports/class_fonreport.inc:171
 msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
+#: plugins/gofon/fonreports/class_fonreport.inc:189
 msgid "Query for phone database failed!"
 msgstr ""
 
@@ -9973,7 +14051,7 @@ msgstr ""
 
 #: plugins/generic/welcome/welcome.tpl:4
 msgid ""
-"This is the GOsa main screen. You can select your tasks from the menu on the "
+"This is the GOsa main menu. You can select your tasks from the menu on the "
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
@@ -9997,7 +14075,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:354
+#: include/php_setup.inc:71 html/main.php:381
 msgid "Toggle information"
 msgstr ""
 
@@ -10033,220 +14111,361 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:290
+#: include/functions.inc:299
 #, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:311
+#: include/functions.inc:316
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:330
+#: include/functions.inc:337
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:368
+#: include/functions.inc:468
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:378
+#: include/functions.inc:478
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:393
+#: include/functions.inc:493
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:419
+#: include/functions.inc:519
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:449
+#: include/functions.inc:549
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:459
+#: include/functions.inc:559
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:467
+#: include/functions.inc:567
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:581
+#: include/functions.inc:653
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:583
+#: include/functions.inc:655
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/functions.inc:672
+msgid "incomplete"
+msgstr ""
+
+#: include/functions.inc:1066 include/functions.inc:1256
+msgid "LDAP error:"
+msgstr ""
+
+#: include/functions.inc:1067
+msgid ""
+"Problems with the LDAP server mean that you probably lost the last changes. "
+"Please check your LDAP setup for possible errors and try again."
+msgstr ""
+
+#: include/functions.inc:1075
+msgid ""
+"Please check your input and fix the error. Press 'OK' to close this message "
+"box."
+msgstr ""
+
+#: include/functions.inc:1084
+msgid "An error occured while processing your request"
+msgstr ""
+
+#: include/functions.inc:1088 include/functions_setup.inc:254
+msgid "OK"
+msgstr ""
+
+#: include/functions.inc:1150
+msgid "Continue anyway"
+msgstr ""
+
+#: include/functions.inc:1152
+msgid "Edit anyway"
+msgstr ""
+
+#: include/functions.inc:1154
+#, 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:1438
+msgid "Entries per page"
+msgstr ""
+
+#: include/functions.inc:1466
+msgid "Apply filter"
+msgstr ""
+
+#: include/functions.inc:1740
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr ""
+
+#: include/functions.inc:1783
+#, php-format
+msgid "GOsa development snapshot (Rev %s)"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:39
+msgid "Warning: Account has an invalid mailserver string!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:52
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:129
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:148
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:174
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:192
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:214
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:242
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:255
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:326
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:330
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_ldap.inc:196
 #, php-format
 msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
-#: include/functions.inc:600
-msgid "incomplete"
+#: include/class_ldap.inc:228
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
 msgstr ""
 
-#: include/functions.inc:1031
+#: include/class_ldap.inc:448
 #, 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."
+msgid "Creating copy of %s"
 msgstr ""
 
-#: include/functions.inc:1130
-msgid "LDAP error:"
+#: include/class_ldap.inc:451
+msgid "Processing"
 msgstr ""
 
-#: include/functions.inc:1308
-msgid "Entries per page"
+#: include/class_ldap.inc:491
+msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/functions.inc:1336
-msgid "Apply filter"
+#: include/class_ldap.inc:554
+#, php-format
+msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/functions.inc:1610
-msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#: include/class_ldap.inc:702
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: include/functions.inc:1653
+#: include/class_ldap.inc:771
 #, php-format
-msgid "GOsa development snapshot (Rev %s)"
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
+#: include/class_ldap.inc:773
+#, php-format
+msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_ldap.inc:995
+#, php-format
 msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:115
+#: include/class_ldap.inc:1024
 #, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:131
+#: include/class_ldap.inc:1152
 #, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
+msgid "Ldap import with dn '%s' failed."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+#: include/class_tabs.inc:182
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/class_tabs.inc:297
+msgid "References"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_plugin.inc:408
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_plugin.inc:591
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:659
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:965
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_ldap.inc:480
+#: include/class_plugin.inc:972
 #, php-format
-msgid "Unknown FAIstate %s"
+msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:594
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_ldap.inc:856
+#: include/class_plugin.inc:1002
 #, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:869
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid "Saving object snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_ldap.inc:885
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
+msgid "You are not allowed to delete this snap shot!"
 msgstr ""
 
-#: include/class_plugin.inc:465
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"The snapshot functionality is enabled, but the required variable(s) '%s' is "
+"not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:1185
 #, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid "Method get available snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1241
+#, php-format
+msgid "Method get deleted snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
+#, php-format
+msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
 
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:115
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
+msgid "Unknown"
+msgstr ""
+
+#: include/class_pluglist.inc:147 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?"
@@ -10267,48 +14486,58 @@ msgstr ""
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr ""
+
+#: include/class_ppdManager.inc:146
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:137
+#: include/class_ppdManager.inc:178
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:182
 msgid "Group name not unique!"
 msgstr ""
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_config.inc:69
+#: include/class_config.inc:71
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:195 html/index.php:141
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:450
+#: include/class_config.inc:472
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -10354,465 +14583,675 @@ msgstr ""
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
-msgstr ""
-
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
 "setup"
 msgstr ""
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr ""
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
 msgstr ""
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:189
 msgid "Support for trustAccount enabled"
 msgstr ""
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:194
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:204
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:209
 msgid "Support for nagios enabled"
 msgstr ""
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:214
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+
+#: include/functions_setup.inc:219
+msgid "Support for netatalk enabled"
+msgstr ""
+
+#: include/functions_setup.inc:229
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:236
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
-msgid "OK"
-msgstr ""
-
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:279
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:282
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:283
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr ""
+
+#: include/functions_setup.inc:287
+msgid ""
+"PHP uses this value for the garbage collector to delete old sessions, "
+"setting this value to one day will prevent loosing session and cookie  "
+"before they really timeout."
+msgstr ""
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:294
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:299
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:302
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:306
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:307
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:310
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:314
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:315
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:318
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:319
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:322
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:323
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:326
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:330
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:367
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:372
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:383
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:396
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:397
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:404
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:420
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:443
-msgid ""
-"In order to use SAMBA 2/3, you've to install some additional packages to "
-"generate password hashes."
+#: include/functions_setup.inc:421
+msgid ""
+"In order to use SAMBA 2/3, you've to install some additional packages to "
+"generate password hashes."
+msgstr ""
+
+#: include/functions_setup.inc:434
+msgid "php.ini check -> session.auto_register"
+msgstr ""
+
+#: include/functions_setup.inc:435
+msgid ""
+"In Order to use GOsa without any trouble, the session.auto_register option "
+"in your php.ini must be set to 'Off'."
+msgstr ""
+
+#: include/functions_setup.inc:438
+msgid "php.ini check -> implicit_flush"
+msgstr ""
+
+#: include/functions_setup.inc:439
+msgid ""
+"This option influences the Output handling. Turn this Option off, to "
+"increase performance."
+msgstr ""
+
+#: include/functions_setup.inc:446
+msgid "php.ini check -> max_execution_time"
+msgstr ""
+
+#: include/functions_setup.inc:447
+msgid ""
+"The Execution time should be at least 30 seconds, because some actions may "
+"consume more time."
+msgstr ""
+
+#: include/functions_setup.inc:454
+msgid "php.ini check -> memory_limit"
+msgstr ""
+
+#: include/functions_setup.inc:455
+msgid ""
+"GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
+"Increase it for larger setups."
+msgstr ""
+
+#: include/functions_setup.inc:459
+msgid "php.ini check -> expose_php"
+msgstr ""
+
+#: include/functions_setup.inc:460
+msgid ""
+"Increase the server security by setting expose_php to 'off'. PHP won't send "
+"any Information about the server you are running in this case."
+msgstr ""
+
+#: include/functions_setup.inc:464
+msgid "php.ini check -> magic_quotes_gpc"
+msgstr ""
+
+#: include/functions_setup.inc:465
+msgid ""
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes in strings in this case."
+msgstr ""
+
+#: include/functions_setup.inc:711
+msgid "You've to specify an ldap server before continuing!"
+msgstr ""
+
+#: include/functions_setup.inc:720 include/functions_setup.inc:803
+msgid ""
+"Can't connect to the specified LDAP server! Please make sure that is "
+"reachable for GOsa."
+msgstr ""
+
+#: include/functions_setup.inc:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
+msgid ""
+"Can't bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
+msgstr ""
+
+#: include/functions_setup.inc:823
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all information twice"
+msgstr ""
+
+#: include/functions_setup.inc:879
+#, php-format
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
+msgstr ""
+
+#: include/functions_setup.inc:910
+msgid ""
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
+msgstr ""
+
+#: include/functions_setup.inc:919
+#, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr ""
+
+#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
+#: include/functions_setup.inc:1061 html/index.php:252
+#: ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+
+#: include/functions_helpviewer.inc:43
+#, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr ""
+
+#: include/functions_helpviewer.inc:84
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+msgid "next"
+msgstr ""
+
+#: include/functions_helpviewer.inc:385
+#, php-format
+msgid "%s results for your search with the keyword %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:459
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
+#: include/class_debconfTemplate.inc:260
+msgid "This package has no debconf options."
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:398
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:502
+msgid "Restore snapshopts of already deleted objects"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:503
+msgid "Restore"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:521
+#: include/class_SnapShotDialog.inc:105
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:527
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:527
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
+
+#: include/functions_dns.inc:171
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:152
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:216
+msgid "Paste"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:218
+msgid "Can't paste"
+msgstr ""
+
+#: include/functions_FAI.inc:358
+#, php-format
+msgid "Error, following objects should be equal '%s' and '%s'"
+msgstr ""
+
+#: include/functions_FAI.inc:464
+#, php-format
+msgid "Release management failed, can't save '%s'"
+msgstr ""
+
+#: include/class_acl.inc:6
+msgid "Access control"
+msgstr ""
+
+#: include/class_acl.inc:152
+msgid "Reset ACLs"
 msgstr ""
 
-#: include/functions_setup.inc:456
-msgid "php.ini check -> session.auto_register"
+#: include/class_acl.inc:153
+msgid "One level"
 msgstr ""
 
-#: include/functions_setup.inc:457
-msgid ""
-"In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini must be set to 'Off'."
+#: include/class_acl.inc:154 include/class_acl.inc:159
+msgid "Current object"
 msgstr ""
 
-#: include/functions_setup.inc:460
-msgid "php.ini check -> implicit_flush"
+#: include/class_acl.inc:155
+msgid "Complete subtree"
 msgstr ""
 
-#: include/functions_setup.inc:461
-msgid ""
-"This option influences the Output handling. Turn this Option off, to "
-"increase performance."
+#: include/class_acl.inc:156
+msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/functions_setup.inc:468
-msgid "php.ini check -> max_execution_time"
+#: include/class_acl.inc:160
+msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/functions_setup.inc:469
-msgid ""
-"The Execution time should be at least 30 seconds, because some actions may "
-"consume more time."
+#: include/class_acl.inc:359
+msgid "Edit ACL"
 msgstr ""
 
-#: include/functions_setup.inc:476
-msgid "php.ini check -> memory_limit"
+#: include/class_acl.inc:360
+msgid "Delete ACL"
 msgstr ""
 
-#: include/functions_setup.inc:477
-msgid ""
-"GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
-"Increase it for larger setups."
+#: include/class_acl.inc:390
+msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/functions_setup.inc:481
-msgid "php.ini check -> expose_php"
+#: include/class_acl.inc:392
+#, php-format
+msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/functions_setup.inc:482
-msgid ""
-"Increase the server security by setting expose_php to 'off'. PHP won't send "
-"any Information about the server you are running in this case."
+#: include/class_acl.inc:397
+msgid "Edit categories ACLs"
 msgstr ""
 
-#: include/functions_setup.inc:486
-msgid "php.ini check -> magic_quotes_gpc"
+#: include/class_acl.inc:398
+msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/functions_setup.inc:487
-msgid ""
-"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
-"escape all quotes in strings in this case."
+#: include/class_acl.inc:437
+#, php-format
+msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/functions_setup.inc:732
-msgid "You've to specify an ldap server before continuing!"
+#: include/class_acl.inc:481
+msgid "Create objects"
 msgstr ""
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
+#: include/class_acl.inc:482
+msgid "Move objects"
 msgstr ""
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
+#: include/class_acl.inc:483
+msgid "Remove objects"
 msgstr ""
 
-#: include/functions_setup.inc:844
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all information twice"
+#: include/class_acl.inc:485 include/class_acl.inc:491
+msgid "Modifyable by owner"
 msgstr ""
 
-#: include/functions_setup.inc:900
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
+#: include/class_acl.inc:488
+msgid "Move object"
 msgstr ""
 
-#: include/functions_setup.inc:931
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
+#: include/class_acl.inc:489
+msgid "Remove object"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/class_acl.inc:588
 #, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
+msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:181
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+#: include/class_acl.inc:628
+#, php-format
+msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/functions_helpviewer.inc:43
+#: include/class_acl.inc:689
 #, php-format
-msgid "XML error in guide.xml: %s at line %d"
+msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:86
-msgid "No help available for this plugin."
+#: include/class_acl.inc:697
+msgid "Members:"
 msgstr ""
 
-#: include/functions_helpviewer.inc:95
-msgid "previous"
+#: include/class_acl.inc:703
+msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99
-msgid "next"
+#: include/class_acl.inc:811
+#, php-format
+msgid "Saving ACLs with dn '%s' failed."
 msgstr ""
 
-#: include/functions_helpviewer.inc:387
+#: include/class_SnapShotDialog.inc:47
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
-#, php-format
-msgid "%s%% hit rate in file %s"
+#: include/class_SnapShotDialog.inc:107
+msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_debconfTemplate.inc:251
-msgid "This package has no debconf options."
+#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+msgid "Y-m-d, H:i:s"
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:141
+msgid "Please specify a valid description for this snapshot."
 msgstr ""
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
+#: html/helpviewer.php:67
+msgid "Help browser"
 msgstr ""
 
-#: html/helpviewer.php:226
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
+msgstr ""
+
+#: html/helpviewer.php:265
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -10836,22 +15275,26 @@ msgid ""
 "please check existence and rights of this directory!"
 msgstr ""
 
-#: html/main.php:149
+#: html/main.php:165
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
 msgstr ""
 
-#: html/main.php:192
+#: html/main.php:207
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:332
+#: html/main.php:342
 #, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:357
+msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:354
+#: html/main.php:381
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -10867,45 +15310,55 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/index.php:49
+#: html/index.php:49 html/index.php:339
+msgid "Session will not be encrypted."
+msgstr ""
+
+#: html/index.php:49 html/index.php:339
+msgid "Enter SSL session"
+msgstr ""
+
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:71
+#: html/index.php:142
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:154
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:162
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:189
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:191
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:198
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:236 html/index.php:296
-msgid "Session will not be encrypted."
+#: html/index.php:293
+msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:236 html/index.php:296
-msgid "Enter SSL session"
+#: html/index.php:345
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
 msgstr ""
 
 #: html/getxls.php:65
@@ -10922,7 +15375,7 @@ msgstr ""
 msgid "User list of %s on %s"
 msgstr ""
 
-#: html/getxls.php:94 html/getxls.php:227
+#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
 msgid "Members"
 msgstr ""
 
@@ -10940,23 +15393,20 @@ msgstr ""
 msgid "Common name"
 msgstr ""
 
+#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
+#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr ""
+
 #: html/getxls.php:156 html/getxls.php:314
 #, php-format
 msgid "Servers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:174
-msgid "Home postal address"
-msgstr ""
-
 #: html/getxls.php:174
 msgid "Mobile phone"
 msgstr ""
 
-#: html/getxls.php:174 html/getxls.php:236
-msgid "Postal address"
-msgstr ""
-
 #: html/getxls.php:174
 msgid "Function"
 msgstr ""
@@ -10990,10 +15440,6 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Surename"
-msgstr ""
-
 #: html/getxls.php:236
 msgid "Title"
 msgstr ""
@@ -11032,7 +15478,7 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/default/sizelimit.tpl:3
 msgid ""
 "The size limit option makes LDAP operations faster and saves the LDAP server "
 "from getting too much load. The easiest way to handle big databases without "
@@ -11040,157 +15486,143 @@ msgid ""
 "filters to get the entries you are looking for."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/default/sizelimit.tpl:6
 msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/default/sizelimit.tpl:9
 msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
 #: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
+#: ihtml/themes/default/login.tpl:14
+msgid "Please use your username and password 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
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+#: ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+#: ihtml/themes/default/login.tpl:58
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
 "you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the <b>Logout</b> button will close this session."
+"possible. Pressing the Logout button will close this session."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/default/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/default/conflict.tpl:14
 msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
 "configuration by performing three major steps: first we'll check the PHP "
 "installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
+"needed programms and after you've provided basic information for your LDAP "
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:15
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: 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/framework.tpl:15
 msgid "Main"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:20
 #: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:25
 #: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:33
 #: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:9
+#: ihtml/themes/default/islocked.tpl:9
 msgid ""
 "If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
 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/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
-msgid ""
-"Now we're going include your LDAP server and create an initial "
-"configuration. After you've entered the server URI below, a quick check is "
-"performed if required LDAP schemas are in place. Samba versions are "
-"autodetected by the installed objectclasses. Details on how your LDAP tree "
-"is organized will be asked later on."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step4.tpl:2
 #: ihtml/themes/default/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
 #: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
@@ -11198,17 +15630,10 @@ msgid ""
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -11216,32 +15641,26 @@ msgid ""
 "values below if the fit your needs."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
 msgid "Base "
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
 #: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
 #: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
 #: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
 #: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
@@ -11249,12 +15668,10 @@ msgid ""
 "used here, too."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
 #: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
 #: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
@@ -11262,61 +15679,94 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
 #: ihtml/themes/default/setup_step4.tpl:88
 msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it  could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
 msgid "true"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
 msgid "false"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
+#: 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/default/setup_step3.tpl:4
+msgid ""
+"Now we're going include your LDAP server and create an initial "
+"configuration. After you've entered the server URI below, a quick check is "
+"performed if required LDAP schemas are in place. Samba versions are "
+"autodetected by the installed objectclasses. Details on how your LDAP tree "
+"is organized will be asked later on."
+msgstr ""
+
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"(Example: ldap://your.server:389)."
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr ""
+
 #: ihtml/themes/default/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:3
 #: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:7
 #: ihtml/themes/default/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
@@ -11324,12 +15774,10 @@ msgid ""
 "gosa. Change it as needed."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
@@ -11337,78 +15785,113 @@ msgid ""
 "execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/default/acl.tpl:2
+msgid "Assigned ACLs for current entry"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+#: ihtml/themes/default/acl.tpl:4
+msgid "New ACL"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+#: ihtml/themes/default/acl.tpl:8
+msgid "ACL type"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:17
-msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
+#: ihtml/themes/default/acl.tpl:8
+msgid "Select an acl type"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
+#: ihtml/themes/default/acl.tpl:15
+msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/islocked.tpl:9
+#: ihtml/themes/default/acl.tpl:29
+msgid "Available members"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:55
+msgid "List of available ACL categories"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:63
+msgid "ACLs for this object"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the <i>Edit anyway</i> button."
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/islocked.tpl:13
-msgid "Edit anyway"
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+msgid "Operation complete"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:3
+msgid "Restoring object snapshots"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:6
 msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
+"This procedure will restore a snapshot of the selected object. It will "
+"replace the existing object after pressing the restore button."
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/snapshotdialog.tpl:23
+msgid "There is no snapshot available that could be restored"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "Choose a snapshot and click the folder image, to restore the snapshot"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
+#: ihtml/themes/default/snapshotdialog.tpl:44
+msgid "Creating object snapshots"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7
+#: ihtml/themes/default/snapshotdialog.tpl:47
 msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
+"This procedure will create a snapshot of the selected object. It will be "
+"stored inside a special branch of your directory system and can be restored "
+"later on."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
+#: ihtml/themes/default/snapshotdialog.tpl:62
+msgid "Timestamp"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:71
+msgid "Reason for generating this snapshot"
 msgstr ""