Fixed error msgs for server - kolab,generic,dns

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 806bc3a405e8a0a86bbbbf574c3aeb568b7eaacb..cf41c176734315d1fd1b968afc5f646d533f92d0 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -12,9 +12,9 @@ msgstr ""
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
 #: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
-#: contrib/gosa.conf:125 contrib/gosa.conf:136 contrib/gosa.conf:146
-#: contrib/gosa.conf:151 contrib/gosa.conf:175 contrib/gosa.conf:180
-#: contrib/gosa.conf:185 contrib/gosa.conf:190
+#: contrib/gosa.conf:125 contrib/gosa.conf:134 contrib/gosa.conf:144
+#: contrib/gosa.conf:149 contrib/gosa.conf:172 contrib/gosa.conf:177
+#: contrib/gosa.conf:182 contrib/gosa.conf:187
 #: 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
@@ -48,32 +48,32 @@ msgstr ""
 
 #: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_divListGroup.inc:144
-#: plugins/admin/users/class_divListUsers.inc:157
+#: plugins/admin/groups/class_divListGroup.inc:156
+#: plugins/admin/users/class_divListUsers.inc:169
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_divListGroup.inc:136
-#: plugins/admin/users/class_divListUsers.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:178
-#: plugins/admin/ogroups/class_divListOGroup.inc:141
+#: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: 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_divListGroup.inc:138
-#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/users/class_divListUsers.inc:177
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
 #: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/users/class_divListUsers.inc:179
 msgid "Netatalk"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:163
+#: plugins/admin/users/class_divListUsers.inc:175
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -101,8 +101,8 @@ msgstr ""
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_divListGroup.inc:142
-#: plugins/admin/users/class_divListUsers.inc:161
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:173
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/systems/class_systemManagement.inc:758
@@ -118,9 +118,9 @@ msgstr ""
 
 #: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
 #: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
-#: contrib/gosa.conf:132 contrib/gosa.conf:142 contrib/gosa.conf:147
-#: contrib/gosa.conf:152 contrib/gosa.conf:176 contrib/gosa.conf:181
-#: contrib/gosa.conf:186 contrib/gosa.conf:191
+#: contrib/gosa.conf:130 contrib/gosa.conf:140 contrib/gosa.conf:145
+#: contrib/gosa.conf:150 contrib/gosa.conf:173 contrib/gosa.conf:178
+#: contrib/gosa.conf:183 contrib/gosa.conf:188
 msgid "References"
 msgstr ""
 
@@ -145,25 +145,25 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:137
+#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:135
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:138
+#: contrib/gosa.conf:118 contrib/gosa.conf:136
 #: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:139
-#: plugins/personal/environment/environment.tpl:171
+#: contrib/gosa.conf:119 contrib/gosa.conf:137
+#: plugins/personal/environment/environment.tpl:173
 #: plugins/admin/systems/class_systemManagement.inc:767
 #: plugins/admin/ogroups/class_ogroupManagement.inc:381
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:131 contrib/gosa.conf:140
+#: contrib/gosa.conf:120 contrib/gosa.conf:129 contrib/gosa.conf:138
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
@@ -187,15 +187,15 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:141
+#: contrib/gosa.conf:128 contrib/gosa.conf:139
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:199
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:213 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:210 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -204,92 +204,92 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:214
+#: contrib/gosa.conf:211
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:215 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:212 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
-#: plugins/addons/ldapmanager/contentimport.tpl:49
+#: plugins/addons/ldapmanager/contentimport.tpl:50
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:216
+#: contrib/gosa.conf:213
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:220
+#: contrib/gosa.conf:217
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:224 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:221 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/applications/generic.tpl:99
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:228 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:225 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:232 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:229 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:236 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:233 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:240 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:237 plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:241 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: contrib/gosa.conf:238 plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:242
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:264
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:293 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:284 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:294
+#: contrib/gosa.conf:285
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:295
+#: contrib/gosa.conf:286
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:296
+#: contrib/gosa.conf:287
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:297
+#: contrib/gosa.conf:288
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:298
+#: contrib/gosa.conf:289
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:299
+#: contrib/gosa.conf:290
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:300
+#: contrib/gosa.conf:291
 msgid "Polish"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:330
 #: plugins/admin/users/class_userManagement.inc:626
 #: plugins/admin/applications/class_applicationManagement.inc:350
-#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -411,8 +411,8 @@ 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/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialogNew.tpl:52
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -450,7 +450,7 @@ msgstr ""
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
@@ -467,8 +467,6 @@ msgstr ""
 #: plugins/admin/systems/servkolab.tpl:205
 #: plugins/admin/systems/goNtpServer.tpl:24
 #: plugins/admin/systems/goShareServer.tpl:23
-#: plugins/admin/systems/snapshotdialog.tpl:50
-#: plugins/admin/systems/snapshotdialog.tpl:97
 #: plugins/admin/systems/servdnseditzone.tpl:120
 #: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/goFaxServer.tpl:18
@@ -500,6 +498,8 @@ msgstr ""
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/default/copyPasteDialog.tpl:15
 #: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/snapshotdialog.tpl:50
+#: ihtml/themes/default/snapshotdialog.tpl:97
 msgid "Cancel"
 msgstr ""
 
@@ -517,7 +517,7 @@ msgstr ""
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/netatalk/main.inc:112
 #: plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
@@ -657,7 +657,7 @@ msgstr ""
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
-#: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
@@ -731,10 +731,10 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:606
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:165
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/class_environment.inc:619
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:166
+#: plugins/personal/environment/environment.tpl:183
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -1093,7 +1093,7 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
 #: plugins/admin/systems/goImapServer.tpl:25
-#: plugins/admin/systems/class_divListSystem.inc:183
+#: plugins/admin/systems/class_divListSystem.inc:195
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8
 #: plugins/admin/systems/goFonServer.tpl:8
@@ -1113,7 +1113,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:218
+#: plugins/admin/users/class_divListUsers.inc:230
 msgid "Change password"
 msgstr ""
 
@@ -1167,7 +1167,7 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:50
@@ -1227,15 +1227,15 @@ msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:46
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:50
-#: plugins/admin/departments/class_divListDepartment.inc:45
-#: plugins/admin/systems/class_divListSystem.inc:66
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
+#: 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:51
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
 msgid "Ignore subtrees"
 msgstr ""
 
@@ -1244,9 +1244,9 @@ msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:57
-#: plugins/admin/groups/class_divListGroup.inc:65
-#: plugins/admin/departments/class_divListDepartment.inc:48
-#: plugins/admin/ogroups/class_divListOGroup.inc:72
+#: plugins/admin/groups/class_divListGroup.inc:71
+#: plugins/admin/departments/class_divListDepartment.inc:54
+#: plugins/admin/ogroups/class_divListOGroup.inc:78
 msgid "Regular expression for matching group names"
 msgstr ""
 
@@ -1255,7 +1255,7 @@ msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:68
-#: plugins/admin/groups/class_divListGroup.inc:66
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr ""
 
@@ -1936,23 +1936,25 @@ msgstr ""
 msgid "Saving Samba account failed"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: 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:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: 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:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr ""
 
@@ -1978,10 +1980,10 @@ msgid "Choose the department the search will be based    on"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/fai/class_divListFai.inc:75
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:66
-#: plugins/admin/applications/class_divListApplication.inc:53
+#: plugins/admin/users/class_divListUsers.inc:72
+#: plugins/admin/applications/class_divListApplication.inc:58
 #: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
@@ -1991,11 +1993,11 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:198
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:220
 #: plugins/admin/systems/class_terminalService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
@@ -2004,105 +2006,105 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: 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:285
-#: plugins/personal/environment/class_environment.inc:322
+#: 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:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: 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:295
-#: plugins/personal/environment/class_environment.inc:328
+#: 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:300
-#: plugins/personal/environment/class_environment.inc:333
+#: 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:448
-#: plugins/personal/environment/class_environment.inc:753
+#: plugins/personal/environment/class_environment.inc:461
+#: plugins/personal/environment/class_environment.inc:770
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
+#: 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:613
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:593
-#: plugins/personal/environment/class_environment.inc:594
-#: plugins/personal/environment/class_environment.inc:602
-#: plugins/personal/environment/class_environment.inc:603
+#: plugins/personal/environment/class_environment.inc:606
+#: plugins/personal/environment/class_environment.inc:607
+#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:616
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:607
+#: plugins/personal/environment/class_environment.inc:620
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:756
+#: plugins/personal/environment/class_environment.inc:773
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:808
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:861
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:868
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:906
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1000
+#: plugins/personal/environment/class_environment.inc:1017
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1070
+#: plugins/personal/environment/class_environment.inc:1087
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1139
+#: plugins/personal/environment/class_environment.inc:1157
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1152
+#: plugins/personal/environment/class_environment.inc:1170
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1184
+#: plugins/personal/environment/class_environment.inc:1202
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1189
+#: plugins/personal/environment/class_environment.inc:1207
 msgid "Default printer"
 msgstr ""
 
@@ -2130,7 +2132,7 @@ msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
 #: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:148
+#: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
 
@@ -2233,33 +2235,33 @@ msgstr ""
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:151
+#: plugins/personal/environment/environment.tpl:152
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:153
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:106
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/personal/environment/environment.tpl:164
+#: plugins/admin/groups/class_divListGroup.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:164
+#: plugins/personal/environment/environment.tpl:165
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:172
+#: plugins/personal/environment/environment.tpl:174
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/environment/environment.tpl:184
 msgid "Toggle admin"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:183
+#: plugins/personal/environment/environment.tpl:185
 msgid "Toggle default"
 msgstr ""
 
@@ -2300,14 +2302,12 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/printer.tpl:13 plugins/admin/systems/component.tpl:30
-#: plugins/admin/systems/server.tpl:10
-#: plugins/admin/systems/snapshotdialog.tpl:86
-#: plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/servnfs.tpl:17 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
 #: plugins/gofon/conference/generic.tpl:56
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
+#: html/getxls.php:230 ihtml/themes/default/snapshotdialog.tpl:86
 msgid "Description"
 msgstr ""
 
@@ -2380,6 +2380,34 @@ msgstr ""
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
+msgid "Kiosk profile management"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+msgid "Browse"
+msgstr ""
+
+#: plugins/personal/environment/kioskManagement.tpl:25
+#: plugins/admin/fai/class_faiSummaryTab.inc:219
+#: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturer.tpl:13
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: include/class_MultiSelectWindow.inc:79
+msgid "Close"
+msgstr ""
+
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
+msgstr ""
+
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 msgid "Create new hotplug entry"
 msgstr ""
@@ -2394,10 +2422,18 @@ msgid "Device name"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:33
+msgid "Product ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:40
 msgid "Device ID"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/hotplugDialogNew.tpl:51
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/addons/addressbook/address_edit.tpl:233
@@ -2413,8 +2449,6 @@ msgstr ""
 #: plugins/admin/systems/servkolab.tpl:203
 #: plugins/admin/systems/goNtpServer.tpl:22
 #: plugins/admin/systems/goShareServer.tpl:21
-#: plugins/admin/systems/snapshotdialog.tpl:48
-#: plugins/admin/systems/snapshotdialog.tpl:95
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/goFaxServer.tpl:16
 #: plugins/admin/systems/servdns.tpl:21 plugins/admin/systems/servnfs.tpl:120
@@ -2431,34 +2465,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/environment/kioskManagement.tpl:1
-#: plugins/personal/environment/kioskManagement.tpl:5
-msgid "Kiosk profile management"
-msgstr ""
-
-#: plugins/personal/environment/kioskManagement.tpl:13
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr ""
-
-#: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/fai/class_faiSummaryTab.inc:219
-#: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#: plugins/admin/systems/glpi_edit_os.tpl:15
-#: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:79
-msgid "Close"
-msgstr ""
-
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr ""
-
 #: plugins/personal/generic/password.tpl:2
 msgid ""
 "You have changed the method your password is stored in the ldap database. "
@@ -2556,32 +2562,32 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:101
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/groups/class_divListGroup.inc:115
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/class_divListApplication.inc:113
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:118
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/departments/class_divListDepartment.inc:87
+#: plugins/admin/departments/class_divListDepartment.inc:93
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:14
 #: plugins/admin/systems/terminal.tpl:17
-#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/class_divListSystem.inc:120
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/servservice.tpl:61 plugins/admin/systems/phone.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/class_divListOGroup.inc:119
+#: plugins/admin/ogroups/class_divListOGroup.inc:125
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_divListMacros.inc:85
+#: plugins/gofon/macro/class_divListMacros.inc:98
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_divListConferences.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
@@ -2663,13 +2669,13 @@ msgid "Organization"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:217
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/users/class_divListUsers.inc:50
-#: plugins/admin/applications/class_divListApplication.inc:46
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/ogroups/class_ogroupManagement.inc:376
-#: plugins/gofon/macro/class_divListMacros.inc:46
+#: plugins/gofon/macro/class_divListMacros.inc:52
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
@@ -2887,7 +2893,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:1028
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:251
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
@@ -2901,13 +2907,13 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:1011
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:254
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1014
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:257
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -3131,7 +3137,7 @@ msgid "GB"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:314
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
@@ -3441,7 +3447,7 @@ msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:449
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:240
 msgid "Required field 'Name' is not set."
 msgstr ""
 
@@ -3473,289 +3479,295 @@ msgid ""
 "select box."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 msgid "Blocklist name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:47
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_divListFai.inc:60
-#: plugins/admin/groups/class_divListGroup.inc:51
-#: plugins/admin/users/class_divListUsers.inc:52
-#: plugins/admin/applications/class_divListApplication.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:42
+#: plugins/admin/fai/class_divListFai.inc:66
+#: 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:48
 #: plugins/admin/systems/class_divListSystemService.inc:31
-#: plugins/admin/systems/class_divListSystem.inc:53
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_divListOGroup.inc:54
-#: plugins/gofon/macro/class_divListMacros.inc:48
-#: plugins/gofon/conference/class_divListConferences.inc:49
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/conference/class_divListConferences.inc:55
 msgid "Actions"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
 msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
 msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
 msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
 msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:50
-#: plugins/admin/departments/class_divListDepartment.inc:45
-#: plugins/admin/systems/class_divListSystem.inc:66
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
+#: 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:51
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: 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_divListBlocklists.inc:57
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
-#: plugins/admin/fai/class_divListFai.inc:111
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:94
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_divListSystem.inc:88
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/admin/fai/class_divListFai.inc:117
+#: 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:75
+#: plugins/admin/systems/class_divListSystem.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
 msgid "Go to root department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
 #: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/fai/class_divListFai.inc:111
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:94
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_divListSystem.inc:88
+#: plugins/admin/fai/class_divListFai.inc:117
+#: 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:75
+#: plugins/admin/systems/class_divListSystem.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
 msgid "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/admin/fai/class_divListFai.inc:114
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:96
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:71
-#: plugins/admin/systems/class_divListSystem.inc:90
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/admin/fai/class_divListFai.inc:120
+#: 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:77
+#: plugins/admin/systems/class_divListSystem.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
 msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
 #: plugins/addons/godfs/class_dfsManagment.inc:213
 #: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/admin/fai/class_divListFai.inc:114
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:96
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:71
-#: plugins/admin/systems/class_divListSystem.inc:90
+#: plugins/admin/fai/class_divListFai.inc:120
+#: 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:77
+#: plugins/admin/systems/class_divListSystem.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:98
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/systems/class_divListSystem.inc:92
+#: 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_divListSystem.inc:98
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:98
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/fai/class_divListFai.inc:123
+#: 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:79
+#: plugins/admin/systems/class_divListSystem.inc:98
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/admin/fai/class_divListFai.inc:119
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/users/class_divListUsers.inc:100
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/departments/class_divListDepartment.inc:75
-#: plugins/admin/systems/class_divListSystem.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/admin/fai/class_divListFai.inc:125
+#: 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:81
+#: plugins/admin/systems/class_divListSystem.inc:99
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
 msgid "Reload list"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:120
-#: plugins/admin/fai/class_divListFai.inc:156
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/groups/class_divListGroup.inc:110
-#: plugins/admin/users/class_divListUsers.inc:100
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/applications/class_divListApplication.inc:115
-#: plugins/admin/departments/class_divListDepartment.inc:75
-#: plugins/admin/departments/class_divListDepartment.inc:89
-#: plugins/admin/systems/class_divListSystem.inc:93
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/groups/class_divListGroup.inc:116
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/applications/class_divListApplication.inc:120
+#: plugins/admin/departments/class_divListDepartment.inc:81
+#: plugins/admin/departments/class_divListDepartment.inc:95
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:123
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:121
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:81
-#: plugins/gofon/conference/class_divListConferences.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:88
-#: plugins/admin/fai/class_divListFai.inc:131
-#: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:105
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:80
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/ogroups/class_divListOGroup.inc:110
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:88
-#: plugins/admin/fai/class_divListFai.inc:131
-#: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:105
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:80
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/ogroups/class_divListOGroup.inc:110
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
 msgid "Restore"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:156
-#: plugins/admin/groups/class_divListGroup.inc:110
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:115
-#: plugins/admin/departments/class_divListDepartment.inc:89
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:116
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:120
+#: plugins/admin/departments/class_divListDepartment.inc:95
+#: plugins/admin/systems/class_divListSystem.inc:123
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/ogroups/class_divListOGroup.inc:121
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
 #: plugins/admin/fai/class_faiScript.inc:228
 #: plugins/admin/fai/class_faiScript.inc:231
 #: plugins/admin/fai/class_faiTemplate.inc:198
 #: plugins/admin/fai/class_faiTemplate.inc:201
 #: plugins/admin/fai/class_faiHook.inc:252
 #: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/fai/class_divListFai.inc:216
-#: plugins/admin/fai/class_divListFai.inc:221
-#: plugins/admin/groups/class_divListGroup.inc:165
-#: plugins/admin/users/class_divListUsers.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/departments/class_divListDepartment.inc:117
+#: plugins/admin/fai/class_divListFai.inc:228
+#: plugins/admin/fai/class_divListFai.inc:233
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/users/class_divListUsers.inc:227
+#: plugins/admin/applications/class_divListApplication.inc:168
+#: plugins/admin/departments/class_divListDepartment.inc:129
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/systems/class_divListSystem.inc:151
+#: plugins/admin/systems/class_divListSystem.inc:163
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_divListOGroup.inc:156
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/macro/class_divListMacros.inc:115
+#: plugins/gofon/macro/class_divListMacros.inc:135
+#: plugins/gofon/conference/class_divListConferences.inc:131
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
-#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
+#: plugins/admin/users/class_divListUsers.inc:228
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:120
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/fai/class_faiScript.inc:232
 #: plugins/admin/fai/class_faiTemplate.inc:202
 #: plugins/admin/fai/class_faiHook.inc:256
-#: plugins/admin/fai/class_divListFai.inc:223
-#: plugins/admin/groups/class_divListGroup.inc:167
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/applications/class_divListApplication.inc:162
-#: plugins/admin/departments/class_divListDepartment.inc:119
-#: plugins/admin/systems/class_divListSystem.inc:152
-#: plugins/admin/ogroups/class_divListOGroup.inc:158
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: plugins/admin/fai/class_divListFai.inc:235
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:231
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_divListSystem.inc:164
+#: plugins/admin/ogroups/class_divListOGroup.inc:170
+#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/conference/class_divListConferences.inc:133
+#: plugins/gofon/conference/class_divListConferences.inc:135
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:120
-#: plugins/admin/users/class_divListUsers.inc:220
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
+#: plugins/admin/users/class_divListUsers.inc:232
 msgid "Delete user"
 msgstr ""
 
@@ -4141,8 +4153,8 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
-#: plugins/admin/systems/snapshotdialog.tpl:78
 #: plugins/gofon/fonreports/contents.tpl:30
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Date"
 msgstr ""
 
@@ -4382,8 +4394,8 @@ msgid "Creating new entry in"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
-#: plugins/addons/mailqueue/class_mailqueue.inc:361
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
 msgid "All"
@@ -4533,50 +4545,57 @@ msgid ""
 "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:86
-#: plugins/addons/mailqueue/class_mailqueue.inc:94
-#: plugins/addons/mailqueue/class_mailqueue.inc:113
-#: plugins/addons/mailqueue/class_mailqueue.inc:122
-#: plugins/addons/mailqueue/class_mailqueue.inc:177
-#: plugins/addons/mailqueue/class_mailqueue.inc:204
+#: 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:216
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
 msgid "There are no mail server specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:266
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:268
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:311
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:316
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:362
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:363
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:364
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 #: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:365
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
@@ -4793,14 +4812,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:33
-msgid "Overwrite existing entry"
+#: plugins/addons/ldapmanager/contentimport.tpl:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+msgid "Remove existing entries first"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr ""
 
@@ -5005,7 +5028,7 @@ msgstr ""
 #: 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/tabs_department.inc:31
+#: plugins/admin/departments/tabs_department.inc:30
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -5068,14 +5091,16 @@ msgstr ""
 #: plugins/admin/fai/class_faiManagement.inc:392
 #: plugins/admin/fai/class_faiManagement.inc:552
 #: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:410
-#: plugins/admin/departments/class_departmentGeneric.inc:495
+#: plugins/admin/departments/class_departmentGeneric.inc:418
+#: plugins/admin/departments/class_departmentGeneric.inc:503
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: 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:48
+#: ihtml/themes/default/snapshotdialog.tpl:95
 msgid "Continue"
 msgstr ""
 
@@ -5267,12 +5292,12 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_divListGroup.inc:50
-#: plugins/admin/users/class_divListUsers.inc:51
+#: 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:53
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -5636,139 +5661,139 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:58
+#: plugins/admin/fai/class_divListFai.inc:64
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:59
+#: plugins/admin/fai/class_divListFai.inc:65
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:62
+#: plugins/admin/fai/class_divListFai.inc:68
 msgid "Display FAI profile objects"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:62
+#: plugins/admin/fai/class_divListFai.inc:68
 msgid "Show profiles"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:63
+#: plugins/admin/fai/class_divListFai.inc:69
 msgid "Display FAI template objects"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:63
-#: plugins/admin/users/class_divListUsers.inc:54
+#: plugins/admin/fai/class_divListFai.inc:69
+#: plugins/admin/users/class_divListUsers.inc:60
 msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:64
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Display FAI scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:64
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Show scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:65
+#: plugins/admin/fai/class_divListFai.inc:71
 msgid "Display FAI hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:65
+#: plugins/admin/fai/class_divListFai.inc:71
 msgid "Show hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/fai/class_divListFai.inc:72
 msgid "Display FAI variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/fai/class_divListFai.inc:72
 msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:67
+#: plugins/admin/fai/class_divListFai.inc:73
 msgid "Display FAI packages"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:67
+#: plugins/admin/fai/class_divListFai.inc:73
 msgid "Show packages"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:68
+#: plugins/admin/fai/class_divListFai.inc:74
 msgid "Display FAI partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:68
+#: plugins/admin/fai/class_divListFai.inc:74
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:79
 msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:131
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:142
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:142
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:145
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:145
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:148
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:148
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:148
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:148
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:217
-#: plugins/admin/fai/class_divListFai.inc:222
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/fai/class_divListFai.inc:234
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:224
+#: plugins/admin/fai/class_divListFai.inc:236
 msgid "Delete class"
 msgstr ""
 
@@ -6017,7 +6042,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_divListConferences.inc:47
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
@@ -6206,109 +6231,109 @@ msgid ""
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:49
+#: plugins/admin/groups/class_divListGroup.inc:55
 msgid "Groupname / Department"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:58
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:58
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:106
+#: plugins/admin/groups/class_divListGroup.inc:112
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/admin/users/class_divListUsers.inc:155
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:167
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/applications/class_divListApplication.inc:139
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/applications/class_divListApplication.inc:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:375
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:160
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:155
-#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:160
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:155
-#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:162
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/applications/class_divListApplication.inc:157
-#: plugins/admin/ogroups/class_divListOGroup.inc:153
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:162
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/applications/class_divListApplication.inc:157
-#: plugins/admin/ogroups/class_divListOGroup.inc:153
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:165
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/departments/class_divListDepartment.inc:117
-#: plugins/admin/ogroups/class_divListOGroup.inc:156
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/applications/class_divListApplication.inc:168
+#: plugins/admin/departments/class_divListDepartment.inc:129
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/conference/class_divListConferences.inc:131
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:167
-#: plugins/admin/applications/class_divListApplication.inc:162
-#: plugins/admin/departments/class_divListDepartment.inc:119
-#: plugins/admin/ogroups/class_divListOGroup.inc:158
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:170
+#: plugins/gofon/conference/class_divListConferences.inc:133
+#: plugins/gofon/conference/class_divListConferences.inc:135
 msgid "Delete this entry"
 msgstr ""
 
@@ -6376,8 +6401,8 @@ msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:476
-#: plugins/admin/systems/snapshotdialog.tpl:70 include/class_ldap.inc:455
+#: plugins/admin/departments/class_departmentGeneric.inc:484
+#: include/class_ldap.inc:455 ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Object"
 msgstr ""
 
@@ -6415,7 +6440,7 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/systems/class_divListSystem.inc:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -6567,7 +6592,7 @@ msgid "The selected application has no options."
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:638
-#: plugins/admin/departments/class_divListDepartment.inc:134
+#: plugins/admin/departments/class_divListDepartment.inc:146
 msgid "department"
 msgstr ""
 
@@ -6656,10 +6681,10 @@ msgid "You are not allowed to delete this user!"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:453
-#: plugins/admin/systems/snapshotdialog.tpl:35
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
+#: ihtml/themes/default/snapshotdialog.tpl:35
 msgid "none"
 msgstr ""
 
@@ -6707,125 +6732,125 @@ msgid ""
 "user list."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:50
+#: plugins/admin/users/class_divListUsers.inc:56
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:54
+#: plugins/admin/users/class_divListUsers.inc:60
 msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:55
+#: 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:55
+#: plugins/admin/users/class_divListUsers.inc:61
 msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:62
 msgid "Select to see users that have posix settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:62
 msgid "Show unix users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/class_divListUsers.inc:63
 msgid "Select to see users that have mail settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/class_divListUsers.inc:63
 msgid "Show mail users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/users/class_divListUsers.inc:64
 msgid "Select to see users that have samba settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/users/class_divListUsers.inc:64
 msgid "Show samba users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:59
+#: plugins/admin/users/class_divListUsers.inc:65
 msgid "Select to see users that have proxy settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:59
+#: plugins/admin/users/class_divListUsers.inc:65
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:110
+#: plugins/admin/users/class_divListUsers.inc:116
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:110
+#: plugins/admin/users/class_divListUsers.inc:116
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:112
+#: plugins/admin/users/class_divListUsers.inc:118
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:112
+#: plugins/admin/users/class_divListUsers.inc:118
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:153
+#: plugins/admin/users/class_divListUsers.inc:165
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:154
+#: plugins/admin/users/class_divListUsers.inc:166
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:156
+#: plugins/admin/users/class_divListUsers.inc:168
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:158
+#: plugins/admin/users/class_divListUsers.inc:170
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:160
+#: plugins/admin/users/class_divListUsers.inc:172
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/users/class_divListUsers.inc:174
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:166
+#: plugins/admin/users/class_divListUsers.inc:178
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:180
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/users/class_divListUsers.inc:181
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:229
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/users/class_divListUsers.inc:251
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:246
+#: plugins/admin/users/class_divListUsers.inc:258
 msgid "Offline"
 msgstr ""
 
@@ -6844,19 +6869,19 @@ msgid ""
 "working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:46
+#: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:446
 msgid "Application name"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:109
-#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/applications/class_divListApplication.inc:115
 msgid "Create new application"
 msgstr ""
 
@@ -7046,11 +7071,11 @@ msgid ""
 "of the department list."
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:41
+#: plugins/admin/departments/class_divListDepartment.inc:47
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:85
+#: plugins/admin/departments/class_divListDepartment.inc:91
 msgid "Create new department"
 msgstr ""
 
@@ -7146,51 +7171,51 @@ msgstr ""
 msgid "Removing department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:226
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
-#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:247
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:284
+#: plugins/admin/departments/class_departmentGeneric.inc:291
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:326
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 msgid "Saving department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:363
+#: plugins/admin/departments/class_departmentGeneric.inc:371
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:440
+#: plugins/admin/departments/class_departmentGeneric.inc:448
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:479
+#: plugins/admin/departments/class_departmentGeneric.inc:487
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
@@ -7205,7 +7230,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:342
+#: plugins/admin/departments/class_departmentManagement.inc:345
 msgid ".."
 msgstr ""
 
@@ -7456,7 +7481,7 @@ msgid "Execution of '%s' failed!"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:239
+#: plugins/admin/systems/class_workstationGeneric.inc:246
 #: plugins/admin/systems/class_terminalGeneric.inc:262
 #: plugins/admin/ogroups/class_termgroup.inc:204
 #: plugins/admin/ogroups/class_termgroup.inc:213
@@ -7464,7 +7489,7 @@ msgid "Switch off"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:239
+#: plugins/admin/systems/class_workstationGeneric.inc:246
 #: plugins/admin/systems/class_terminalGeneric.inc:263
 #: plugins/admin/ogroups/class_termgroup.inc:205
 #: plugins/admin/ogroups/class_termgroup.inc:213
@@ -7472,37 +7497,37 @@ msgid "Reboot"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:162
-#: plugins/admin/systems/class_workstationGeneric.inc:240
+#: plugins/admin/systems/class_workstationGeneric.inc:247
 #: plugins/admin/ogroups/class_termgroup.inc:206
 msgid "Instant update"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:163
 #: plugins/admin/systems/class_servGeneric.inc:171
-#: plugins/admin/systems/class_workstationGeneric.inc:241
-#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
 #: plugins/admin/ogroups/class_termgroup.inc:207
 msgid "Scheduled update"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:164
 #: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
 #: plugins/admin/ogroups/class_termgroup.inc:208
 msgid "Reinstall"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:165
-#: plugins/admin/systems/class_workstationGeneric.inc:243
+#: plugins/admin/systems/class_workstationGeneric.inc:250
 #: plugins/admin/ogroups/class_termgroup.inc:209
 msgid "Rescan hardware"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:166
 #: plugins/admin/systems/class_servGeneric.inc:172
-#: plugins/admin/systems/class_workstationGeneric.inc:244
-#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
 #: plugins/admin/systems/class_terminalGeneric.inc:264
 #: plugins/admin/systems/class_terminalGeneric.inc:268
 #: plugins/admin/ogroups/class_termgroup.inc:40
@@ -7511,8 +7536,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:167
 #: plugins/admin/systems/class_servGeneric.inc:173
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
 #: plugins/admin/systems/class_terminalGeneric.inc:265
 #: plugins/admin/systems/class_terminalGeneric.inc:269
 #: plugins/admin/ogroups/class_termgroup.inc:41
@@ -7520,7 +7545,7 @@ msgid "System analysis"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:169
-#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_workstationGeneric.inc:254
 #: plugins/admin/systems/class_terminalGeneric.inc:267
 #: plugins/admin/ogroups/class_termgroup.inc:213
 msgid "Wake up"
@@ -7539,8 +7564,8 @@ msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_workstationGeneric.inc:347
-#: plugins/admin/systems/class_terminalGeneric.inc:386
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_terminalGeneric.inc:391
 #: plugins/admin/systems/class_winGeneric.inc:174
 #: plugins/admin/systems/class_componentGeneric.inc:165
 #: plugins/admin/systems/class_printGeneric.inc:618
@@ -7644,10 +7669,6 @@ msgid ""
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:267
-msgid "Removing DNS service failed"
-msgstr ""
-
 #: plugins/admin/systems/class_servDNS.inc:288
 msgid "Updating DNS service failed"
 msgstr ""
@@ -7660,7 +7681,7 @@ msgstr ""
 msgid "Saving DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:356
+#: plugins/admin/systems/class_servDNS.inc:357
 msgid "DNS service"
 msgstr ""
 
@@ -8861,10 +8882,6 @@ msgstr ""
 msgid "Regular expression for matching device names"
 msgstr ""
 
-#: plugins/admin/systems/class_SnapShotDialog.inc:78
-msgid "Please specify a valid description for this snapshot."
-msgstr ""
-
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
@@ -9174,60 +9191,30 @@ msgstr ""
 msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:320
+#: plugins/admin/systems/class_servService.inc:321
 #: plugins/admin/systems/class_goTerminalServer.inc:139
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:379
+#: plugins/admin/systems/class_servService.inc:380
 msgid "Saving server service object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:410
+#: plugins/admin/systems/class_servService.inc:411
 #: plugins/admin/systems/class_goShareServer.inc:287
 msgid "Creating mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:424
+#: plugins/admin/systems/class_servService.inc:425
 #: plugins/admin/systems/class_goShareServer.inc:301
 msgid "Removing mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:436
+#: plugins/admin/systems/class_servService.inc:437
 #: plugins/admin/systems/class_goShareServer.inc:313
 msgid "Saving mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/snapshotdialog.tpl:3
-msgid "Restoring an object snapshot"
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:6
-#: plugins/admin/systems/snapshotdialog.tpl:57
-msgid "This procedure will create a working snapshot of the selected object."
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:13
-#: plugins/admin/systems/snapshotdialog.tpl:62
-msgid "You will be able to restore from"
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:15
-msgid "There are no available snapshots."
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:25
-msgid "There is no snapshot available that could be restored."
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:27
-msgid "Choose a snapshot and click continue, to restore the snapshot."
-msgstr ""
-
-#: plugins/admin/systems/snapshotdialog.tpl:54
-msgid "Creating an object snapshot"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr ""
@@ -9278,29 +9265,29 @@ msgstr ""
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:279
+#: plugins/admin/systems/class_workstationGeneric.inc:293
 msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:330
+#: plugins/admin/systems/class_workstationGeneric.inc:344
 #: plugins/admin/ogroups/class_termgroup.inc:106
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:334
+#: plugins/admin/systems/class_workstationGeneric.inc:348
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:357
-#: plugins/admin/systems/class_terminalGeneric.inc:396
+#: plugins/admin/systems/class_workstationGeneric.inc:371
+#: plugins/admin/systems/class_terminalGeneric.inc:401
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:424
-#: plugins/admin/systems/class_workstationGeneric.inc:442
-#: plugins/admin/ogroups/class_termgroup.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:438
+#: plugins/admin/systems/class_workstationGeneric.inc:456
+#: plugins/admin/ogroups/class_termgroup.inc:298
 msgid "Saving workstation failed"
 msgstr ""
 
@@ -9325,157 +9312,157 @@ msgid ""
 "systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:52
+#: plugins/admin/systems/class_divListSystem.inc:58
 msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/systems/class_divListSystem.inc:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
+#: plugins/admin/systems/class_divListSystem.inc:63
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_divListSystem.inc:65
 msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
+#: plugins/admin/systems/class_divListSystem.inc:66
 msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
+#: plugins/admin/systems/class_divListSystem.inc:66
 msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/systems/class_divListSystem.inc:67
 msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/systems/class_divListSystem.inc:67
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:70
+#: plugins/admin/systems/class_divListSystem.inc:76
 msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:109
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/systems/class_systemManagement.inc:765
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:111
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:111
 #: plugins/admin/systems/class_systemManagement.inc:766
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:106
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:108
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/class_divListSystem.inc:115
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:116
+#: plugins/admin/systems/class_divListSystem.inc:117
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:112
-#: plugins/admin/systems/class_divListSystem.inc:113
+#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:119
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:131
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:132
+#: plugins/admin/systems/class_divListSystem.inc:138
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:133
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:134
+#: plugins/admin/systems/class_divListSystem.inc:140
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:141
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:142
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:144
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:146
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:151
+#: plugins/admin/systems/class_divListSystem.inc:163
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:152
+#: plugins/admin/systems/class_divListSystem.inc:164
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:183
+#: plugins/admin/systems/class_divListSystem.inc:195
 msgid "Set root       password"
 msgstr ""
 
@@ -9761,19 +9748,19 @@ msgstr ""
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:314
+#: plugins/admin/systems/class_terminalGeneric.inc:319
 msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:369
+#: 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:373
+#: plugins/admin/systems/class_terminalGeneric.inc:378
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:476
 msgid "Saving terminal failed"
 msgstr ""
 
@@ -10800,12 +10787,12 @@ msgid "This 'dn' has no phone features."
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:122
 msgid "yes"
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:123
 msgid "no"
 msgstr ""
 
@@ -11004,87 +10991,87 @@ msgid ""
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
 msgid "Select to see groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
 msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
 msgid "Select to see groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
 msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
 msgid "Select to see groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
 msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
 msgid "Select to see groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
 msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
 msgid "Select to see groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
 msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
 msgid "Select to see groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
 msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
 msgid "Select to see groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
 msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
 msgid "Select to see groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
 msgid "Show groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
 msgid "Select to see groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
 msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:172
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -11482,40 +11469,42 @@ msgid ""
 "large number of macros."
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:46
+#: plugins/gofon/macro/class_divListMacros.inc:52
 msgid "macro name"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:47
+#: plugins/gofon/macro/class_divListMacros.inc:53
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/class_divListMacros.inc:60
 #: plugins/gofon/macro/headpage.tpl:41
 msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:103
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:136
 msgid "Edit macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:118
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "Delete macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:121
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:122
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:123
 msgid "invisible"
 msgstr ""
 
@@ -11844,28 +11833,28 @@ msgid ""
 "selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:46
+#: plugins/gofon/conference/class_divListConferences.inc:52
 msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:48
+#: plugins/gofon/conference/class_divListConferences.inc:54
 #: plugins/gofon/conference/generic.tpl:112
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:55
+#: plugins/gofon/conference/class_divListConferences.inc:61
 msgid "Regular expression for matching conference names"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:90
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:90
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:139
+#: plugins/gofon/conference/class_divListConferences.inc:160
 msgid "Conference"
 msgstr ""
 
@@ -12011,45 +12000,45 @@ msgid ""
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:127
+#: 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:146
+#: 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:172
+#: 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:190
+#: 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:212
+#: 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:240
+#: 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:253
+#: 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:324
+#: 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:328
+#: include/class_mail-methods-cyrus.inc:330
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -12101,20 +12090,30 @@ msgstr ""
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1008 include/class_plugin.inc:1098
-#: include/class_plugin.inc:1154 include/class_plugin.inc:1220
+#: include/class_plugin.inc:1025 include/class_plugin.inc:1149
+#: include/class_plugin.inc:1205 include/class_plugin.inc:1269
 msgid "Snapshot failed."
 msgstr ""
 
-#: include/class_plugin.inc:1054 include/class_plugin.inc:1055
+#: include/class_plugin.inc:1072 include/class_plugin.inc:1073
 msgid "Create snapshot failed."
 msgstr ""
 
-#: include/class_plugin.inc:1086
-msgid "Please specify the attribute SNAPSHOT_BASE in your gosa.conf."
+#: include/class_plugin.inc:1105
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1235
+#: include/class_plugin.inc:1117
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable(s) '%s' is "
+"not configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1283
 msgid "Restore snapshot failed."
 msgstr ""
 
@@ -12926,7 +12925,7 @@ msgstr ""
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:458
+#: include/class_config.inc:461
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -12979,27 +12978,26 @@ msgstr ""
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:969
+#: include/class_ldap.inc:995
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:982
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1024
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_ldap.inc:1078
+#: include/class_ldap.inc:1146
 msgid "Ldap import failed"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:79
+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 ""
@@ -13363,28 +13361,6 @@ msgstr ""
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/conflict.tpl:2
-msgid "Session conflict detected"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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/default/conflict.tpl:14
-msgid "Logout"
-msgstr ""
-
 #: ihtml/themes/default/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
@@ -13603,3 +13579,55 @@ msgstr ""
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
+
+#: ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
+msgstr ""
+
+#: 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 Logout button will close this session."
+msgstr ""
+
+#: 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/default/conflict.tpl:14
+msgid "Logout"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:3
+msgid "Restoring an object snapshot"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:6
+#: ihtml/themes/default/snapshotdialog.tpl:57
+msgid "This procedure will create a working snapshot of the selected object."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:13
+#: ihtml/themes/default/snapshotdialog.tpl:62
+msgid "You will be able to restore from"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:15
+msgid "There are no available snapshots."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "There is no snapshot available that could be restored."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:27
+msgid "Choose a snapshot and click continue, to restore the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Creating an object snapshot"
+msgstr ""