Updated German Translation.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index e8c0d4c401a1e8d7b087dc3bb9906d641155e877..b39d597c18d34d653386257eecb9f1d39676273d 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -6,15 +6,15 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:51
+#: contrib/gosa.conf:57
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:70 contrib/gosa.conf:83 contrib/gosa.conf:92
-#: contrib/gosa.conf:98 contrib/gosa.conf:103 contrib/gosa.conf:109
-#: contrib/gosa.conf:118 contrib/gosa.conf:128 contrib/gosa.conf:137
-#: contrib/gosa.conf:142 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:157 contrib/gosa.conf:162
+#: contrib/gosa.conf:76 contrib/gosa.conf:89 contrib/gosa.conf:98
+#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:115
+#: contrib/gosa.conf:124 contrib/gosa.conf:134 contrib/gosa.conf:143
+#: contrib/gosa.conf:148 contrib/gosa.conf:153 contrib/gosa.conf:158
+#: contrib/gosa.conf:163 contrib/gosa.conf:168
 #: 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
@@ -28,65 +28,68 @@ msgstr ""
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:72 contrib/gosa.conf:84
+#: contrib/gosa.conf:78 contrib/gosa.conf:90
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:380
+#: plugins/admin/groups/class_groupManagement.inc:383
 #: plugins/admin/users/class_userManagement.inc:730
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:73 contrib/gosa.conf:86
+#: contrib/gosa.conf:79 contrib/gosa.conf:92
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/groups/class_groupManagement.inc:379
 #: plugins/admin/users/class_userManagement.inc:732
-#: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#: plugins/admin/ogroups/tabs_ogroups.inc:72
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:377
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:380
 #: plugins/admin/users/class_userManagement.inc:738
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:76 plugins/personal/generic/generic.tpl:248
+#: contrib/gosa.conf:82 plugins/personal/generic/generic.tpl:248
 #: plugins/personal/generic/generic.tpl:379
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_userManagement.inc:736
 #: plugins/admin/departments/generic.tpl:62
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:45 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:38 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:77 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:369
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:379
+#: plugins/admin/groups/class_groupManagement.inc:382
 #: plugins/admin/users/class_userManagement.inc:734
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/chooser.tpl:12
@@ -98,51 +101,52 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:78 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:84 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:88 contrib/gosa.conf:94
-#: contrib/gosa.conf:99 contrib/gosa.conf:105 contrib/gosa.conf:114
-#: contrib/gosa.conf:124 contrib/gosa.conf:133 contrib/gosa.conf:138
-#: contrib/gosa.conf:143 contrib/gosa.conf:148 contrib/gosa.conf:153
-#: contrib/gosa.conf:158 contrib/gosa.conf:163
+#: contrib/gosa.conf:85 contrib/gosa.conf:94 contrib/gosa.conf:100
+#: contrib/gosa.conf:105 contrib/gosa.conf:111 contrib/gosa.conf:120
+#: contrib/gosa.conf:130 contrib/gosa.conf:139 contrib/gosa.conf:144
+#: contrib/gosa.conf:149 contrib/gosa.conf:154 contrib/gosa.conf:159
+#: contrib/gosa.conf:164 contrib/gosa.conf:169
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:85
+#: contrib/gosa.conf:91
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:87
+#: contrib/gosa.conf:93
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:93 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:99 plugins/admin/applications/generic.tpl:66
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:190
+#: plugins/admin/systems/class_servRepository.inc:198
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: contrib/gosa.conf:110 plugins/admin/systems/servdnseditzone.tpl:88
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:110 contrib/gosa.conf:129
-#: plugins/admin/ogroups/tabs_ogroups.inc:93
+#: contrib/gosa.conf:116 contrib/gosa.conf:135
+#: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:111 contrib/gosa.conf:130
-#: plugins/admin/ogroups/tabs_ogroups.inc:97
+#: contrib/gosa.conf:117 contrib/gosa.conf:136
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:112 contrib/gosa.conf:131
+#: contrib/gosa.conf:118 contrib/gosa.conf:137
 #: plugins/personal/environment/environment.tpl:172
 #: plugins/admin/systems/class_systemManagement.inc:715
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
@@ -151,7 +155,7 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:113 contrib/gosa.conf:123 contrib/gosa.conf:132
+#: contrib/gosa.conf:119 contrib/gosa.conf:129 contrib/gosa.conf:138
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
@@ -161,32 +165,35 @@ msgstr ""
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
 #: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/servRepository.tpl:17
+#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:119
+#: contrib/gosa.conf:125
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:122 plugins/admin/fai/faiPackage.tpl:29
+#: contrib/gosa.conf:128 plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:179
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:185 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:191 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -195,11 +202,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:192
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:187 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:193 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -208,73 +215,73 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:194
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:192
+#: contrib/gosa.conf:198
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:196 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:202 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/applications/generic.tpl:92
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:557
-#: plugins/admin/fai/class_faiManagement.inc:558
+#: contrib/gosa.conf:206 plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:204 plugins/admin/fai/class_faiManagement.inc:550
-#: plugins/admin/fai/class_faiManagement.inc:551
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:208 plugins/admin/fai/class_faiManagement.inc:571
-#: plugins/admin/fai/class_faiManagement.inc:572
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:212 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:218 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:216
+#: contrib/gosa.conf:222
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:234
+#: contrib/gosa.conf:242
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:251 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:260 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:252
+#: contrib/gosa.conf:261
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:253
+#: contrib/gosa.conf:262
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:254
+#: contrib/gosa.conf:263
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:264
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:256
+#: contrib/gosa.conf:265
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:257
+#: contrib/gosa.conf:266
 msgid "Italian"
 msgstr ""
 
@@ -364,8 +371,8 @@ msgstr ""
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:396
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/fai/class_faiManagement.inc:593
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/users/class_userManagement.inc:633
 #: plugins/admin/applications/class_applicationManagement.inc:304
 #: plugins/admin/departments/class_departmentManagement.inc:347
@@ -379,7 +386,7 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/posix_groups.tpl:67
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:112
 #: plugins/personal/samba/samba3_workstations.tpl:41
@@ -401,25 +408,27 @@ msgstr ""
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:398
-#: plugins/admin/fai/class_faiManagement.inc:403
+#: plugins/admin/fai/class_faiManagement.inc:595
+#: plugins/admin/fai/class_faiManagement.inc:600
 #: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiPackageNew.tpl:44
+#: plugins/admin/fai/faiPackageNew.tpl:45
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:64 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiPackageEntry.tpl:62 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/groups/class_groupManagement.inc:335
+#: plugins/admin/fai/faiNewBranch.tpl:18
+#: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/groups/class_groupManagement.inc:338
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:49
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/class_userManagement.inc:635
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:16
+#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:306
 #: plugins/admin/departments/remove.tpl:16
@@ -431,9 +440,15 @@ msgstr ""
 #: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30
 #: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpiSelectUser.tpl:52
-#: plugins/admin/systems/glpiDeviceManagement.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:643
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpiSelectUser.tpl:53
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:54
+#: plugins/admin/systems/glpiAttachmentPool.tpl:54
+#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/glpiDeviceManagement.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:734
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:340
 #: plugins/admin/ogroups/remove.tpl:16
@@ -468,11 +483,14 @@ msgstr ""
 #: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
 #: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:44
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:46 plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:55 plugins/admin/systems/glpi.tpl:74
-#: plugins/admin/systems/glpi.tpl:94
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:153
+#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
+#: plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -489,7 +507,8 @@ msgstr ""
 msgid "Alias"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:12 html/getxls.php:174
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:39 html/getxls.php:174
 msgid "Mail address"
 msgstr ""
 
@@ -563,7 +582,7 @@ msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:55 plugins/admin/groups/mail.tpl:14
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
 #: plugins/admin/systems/class_systemManagement.inc:710
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:44
@@ -580,7 +599,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:369
+#: plugins/admin/systems/class_printGeneric.inc:401
 msgid "not defined"
 msgstr ""
 
@@ -600,7 +619,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
@@ -611,7 +630,7 @@ msgstr ""
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:181
-#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/gofax/blocklists/generic.tpl:63
@@ -623,7 +642,7 @@ msgstr ""
 #: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:43
 #: plugins/admin/fai/faiTemplate.tpl:40 plugins/admin/fai/faiHook.tpl:43
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:414
+#: plugins/admin/groups/class_groupMail.inc:483
 #: plugins/admin/groups/application.tpl:15
 #: plugins/admin/groups/group_objects.tpl:47
 #: plugins/admin/groups/generic.tpl:103
@@ -634,15 +653,23 @@ msgstr ""
 #: plugins/admin/systems/workstationStartup.tpl:50
 #: plugins/admin/systems/workstationStartup.tpl:70
 #: plugins/admin/systems/workstationStartup.tpl:89
+#: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/servRepository.tpl:11
 #: plugins/admin/systems/glpi_edit_type.tpl:6
 #: plugins/admin/systems/glpiManufacturer.tpl:6
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:6
+#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:372
+#: plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/class_servDNSeditZone.inc:230
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -664,9 +691,9 @@ msgstr ""
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiProfile.tpl:39
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiHook.tpl:45
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
 #: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:105
 #: plugins/admin/users/remove.tpl:14 plugins/admin/applications/remove.tpl:13
@@ -681,8 +708,14 @@ msgstr ""
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:154
+#: plugins/admin/systems/class_termDNS.inc:366
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/class_servDNSeditZone.inc:224
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:15
@@ -732,10 +765,10 @@ msgid "Reject mails bigger than"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:96
-#: plugins/personal/environment/environment.tpl:71
+#: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
 #: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:176
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
 
@@ -787,26 +820,26 @@ msgid "This account has no mail extensions."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:219
-#: plugins/admin/groups/class_groupMail.inc:196
+#: plugins/admin/groups/class_groupMail.inc:264
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:220
-#: plugins/admin/groups/class_groupMail.inc:197
+#: plugins/admin/groups/class_groupMail.inc:265
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:222
-#: plugins/admin/groups/class_groupMail.inc:199
+#: plugins/admin/groups/class_groupMail.inc:267
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:222
-#: plugins/admin/groups/class_groupMail.inc:200
+#: plugins/admin/groups/class_groupMail.inc:268
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -818,20 +851,20 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:276
-#: plugins/admin/groups/class_groupMail.inc:259
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:311
 #: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:355
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:326
-#: plugins/admin/groups/class_groupMail.inc:292
+#: plugins/admin/groups/class_groupMail.inc:360
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
@@ -841,39 +874,39 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:705
-#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/groups/class_groupMail.inc:808
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:709
 #: plugins/personal/mail/class_mailAccount.inc:713
-#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/addons/addressbook/class_addressbook.inc:588
 #: plugins/admin/ogroups/class_mailogroup.inc:70
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:720
-#: plugins/admin/groups/class_groupMail.inc:631
+#: plugins/personal/mail/class_mailAccount.inc:719
+#: plugins/admin/groups/class_groupMail.inc:817
 #: plugins/admin/ogroups/class_mailogroup.inc:77
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:726
-#: plugins/admin/groups/class_groupMail.inc:637
+#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/admin/groups/class_groupMail.inc:823
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:735
-#: plugins/admin/groups/class_groupMail.inc:646
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:832
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:745
-#: plugins/admin/groups/class_groupMail.inc:654
+#: plugins/personal/mail/class_mailAccount.inc:744
+#: plugins/admin/groups/class_groupMail.inc:840
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:749
+#: plugins/personal/mail/class_mailAccount.inc:748
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
@@ -895,17 +928,19 @@ msgstr ""
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
 #: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
 #: plugins/admin/groups/headpage.tpl:30
 #: plugins/admin/groups/group_objects.tpl:20
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:20
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/servRepository.tpl:26
+#: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:29
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:29
+#: plugins/admin/systems/glpiAttachmentPool.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:29
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
@@ -914,7 +949,7 @@ msgid "Filters"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
@@ -994,6 +1029,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
+#: plugins/personal/connectivity/opengw.tpl:49
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr ""
@@ -1010,11 +1046,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
-#: plugins/gofax/faxreports/detail.tpl:68
+#: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1319
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1322
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1070,77 +1106,27 @@ msgstr ""
 msgid "Select groups to add"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:40
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:44
-msgid "Select to see groups that have samba groups mappings"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:45
-msgid "Show samba groups"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:48
-msgid "Select to see groups that have applications configured"
-msgstr ""
-
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
-msgid "Show application groups"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:52
-msgid "Select to see groups that have mail settings"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:53
-msgid "Show mail groups"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:56
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:57
-msgid "Show functional groups"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:36
 msgid "Display groups of department"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:41
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:44
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:73
+#: plugins/personal/posix/posix_groups.tpl:51
+#: plugins/admin/groups/headpage.tpl:75
 msgid "Display groups of user"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/personal/posix/posix_groups.tpl:54
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1181,8 +1167,9 @@ msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:29
-#: plugins/gofax/faxreports/detail.tpl:46
+#: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
 #: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
 msgstr ""
@@ -1224,75 +1211,75 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:135
-#: plugins/personal/posix/class_posixAccount.inc:967
+#: plugins/personal/posix/class_posixAccount.inc:137
+#: plugins/personal/posix/class_posixAccount.inc:970
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:193
+#: plugins/personal/posix/class_posixAccount.inc:195
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/admin/systems/class_workstationService.inc:107
-#: plugins/admin/systems/class_workstationStartup.inc:496
+#: plugins/admin/systems/class_workstationService.inc:114
+#: plugins/admin/systems/class_workstationStartup.inc:466
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:224
+#: plugins/personal/posix/class_posixAccount.inc:227
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:245
 #: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:251
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:249
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:252
+#: plugins/personal/posix/class_posixAccount.inc:255
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:253
+#: plugins/personal/posix/class_posixAccount.inc:256
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:440
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:443
+#: plugins/personal/posix/class_posixAccount.inc:446
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
@@ -1303,7 +1290,7 @@ msgstr ""
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
@@ -1314,7 +1301,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
@@ -1325,7 +1312,7 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 #: plugins/personal/samba/class_sambaAccount.inc:355
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
@@ -1336,7 +1323,7 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:471
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
@@ -1347,7 +1334,7 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:471
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
@@ -1358,7 +1345,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:471
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
@@ -1369,7 +1356,7 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:471
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
@@ -1380,7 +1367,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:471
 #: plugins/personal/samba/class_sambaAccount.inc:356
 #: plugins/personal/samba/class_sambaAccount.inc:374
 #: plugins/personal/samba/class_sambaAccount.inc:392
@@ -1391,7 +1378,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:469
+#: plugins/personal/posix/class_posixAccount.inc:472
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
@@ -1402,7 +1389,7 @@ msgstr ""
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:469
+#: plugins/personal/posix/class_posixAccount.inc:472
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
@@ -1413,7 +1400,7 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:469
+#: plugins/personal/posix/class_posixAccount.inc:472
 #: plugins/personal/samba/class_sambaAccount.inc:357
 #: plugins/personal/samba/class_sambaAccount.inc:375
 #: plugins/personal/samba/class_sambaAccount.inc:393
@@ -1424,90 +1411,90 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:551
+#: plugins/personal/posix/class_posixAccount.inc:554
 #: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:60
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:551
+#: plugins/personal/posix/class_posixAccount.inc:554
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:552
+#: plugins/personal/posix/class_posixAccount.inc:555
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:722
+#: plugins/personal/posix/class_posixAccount.inc:725
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:881
+#: plugins/personal/posix/class_posixAccount.inc:884
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:884
+#: plugins/personal/posix/class_posixAccount.inc:887
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/personal/posix/class_posixAccount.inc:895
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/personal/posix/class_posixAccount.inc:898
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:899
-#: plugins/admin/groups/class_groupGeneric.inc:662
+#: plugins/personal/posix/class_posixAccount.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:658
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:902
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/admin/groups/class_groupGeneric.inc:661
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:913
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:920
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:926
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:929
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:929
+#: plugins/personal/posix/class_posixAccount.inc:932
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/personal/posix/class_posixAccount.inc:937
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/personal/posix/class_posixAccount.inc:940
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:945
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1064
-#: plugins/admin/groups/class_groupGeneric.inc:696
+#: plugins/personal/posix/class_posixAccount.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:697
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1739,7 +1726,7 @@ msgid ""
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:866
+#: plugins/personal/samba/class_sambaAccount.inc:865
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1766,7 +1753,7 @@ msgid "Please select an entry or press cancel."
 msgstr ""
 
 #: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:95
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -1798,70 +1785,70 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:246
-#: plugins/personal/environment/class_environment.inc:282
+#: plugins/personal/environment/class_environment.inc:251
+#: plugins/personal/environment/class_environment.inc:288
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:247
-#: plugins/personal/environment/class_environment.inc:283
+#: plugins/personal/environment/class_environment.inc:252
+#: plugins/personal/environment/class_environment.inc:289
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:256
 #: plugins/personal/environment/class_environment.inc:261
-#: plugins/personal/environment/class_environment.inc:289
+#: plugins/personal/environment/class_environment.inc:266
 #: plugins/personal/environment/class_environment.inc:294
+#: plugins/personal/environment/class_environment.inc:299
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:257
-#: plugins/personal/environment/class_environment.inc:290
+#: plugins/personal/environment/class_environment.inc:262
+#: plugins/personal/environment/class_environment.inc:295
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:262
-#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:267
+#: plugins/personal/environment/class_environment.inc:300
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:395
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:333
+#: plugins/personal/environment/class_environment.inc:404
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:490
-#: plugins/personal/environment/class_environment.inc:492
+#: plugins/personal/environment/class_environment.inc:500
+#: plugins/personal/environment/class_environment.inc:510
 #: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:363
+#: plugins/admin/systems/class_workstationStartup.inc:364
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:721
+#: plugins/personal/environment/class_environment.inc:743
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:728
+#: plugins/personal/environment/class_environment.inc:750
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:750
+#: plugins/personal/environment/class_environment.inc:772
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:843
+#: plugins/personal/environment/class_environment.inc:865
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:913
+#: plugins/personal/environment/class_environment.inc:935
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1037
+#: plugins/personal/environment/class_environment.inc:1059
 msgid "Admin"
 msgstr ""
 
@@ -1888,7 +1875,7 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/environment.tpl:102
 #: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
@@ -1909,63 +1896,63 @@ msgstr ""
 msgid "Profil path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:42
+#: plugins/personal/environment/environment.tpl:40
+msgid "Profil quota"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:54
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:51
+#: plugins/personal/environment/environment.tpl:63
 msgid "Kiosk profile settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/environment.tpl:66
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:60
+#: plugins/personal/environment/environment.tpl:72
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:65
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Quota"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/environment.tpl:81
 msgid "Resolution changeable on runtime"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:87
+#: plugins/personal/environment/environment.tpl:86
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:106
+#: plugins/personal/environment/environment.tpl:105
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:119
+#: plugins/personal/environment/environment.tpl:118
 #: plugins/admin/systems/workstationStartup.tpl:88
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/kioskManagement.tpl:14
+#: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/admin/fai/faiPackage.tpl:62
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
-#: plugins/admin/groups/class_groupMail.inc:418
+#: plugins/admin/groups/class_groupMail.inc:487
 #: plugins/admin/applications/class_applicationParameters.inc:98
 #: plugins/admin/systems/workstationStartup.tpl:90
-#: plugins/admin/systems/printer.tpl:47
+#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/glpiPrinter.tpl:122
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -1989,7 +1976,7 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/groups/class_groupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "New"
 msgstr ""
@@ -2070,15 +2057,15 @@ msgid "Logon script"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/personal/environment/kioskManagement.tpl:24
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:67
 #: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:63
+#: plugins/admin/fai/faiPackageEntry.tpl:61
 #: plugins/admin/fai/faiHookEntry.tpl:69
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/fai/faiNewBranch.tpl:17
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
 #: plugins/admin/systems/printerPPDDialog.tpl:22
@@ -2086,22 +2073,24 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:61
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:64
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:94
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2132,12 +2121,23 @@ msgstr ""
 msgid "Kiosk profile management"
 msgstr ""
 
-#: plugins/personal/environment/kioskManagement.tpl:12
+#: 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/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_type.tpl:13
+#: plugins/admin/systems/glpiManufacturer.tpl:13
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: plugins/admin/systems/glpi_edit_os.tpl:13
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:13
+msgid "Close"
+msgstr ""
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr ""
@@ -2162,8 +2162,11 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:86
-#: plugins/admin/systems/glpi_devices.tpl:642
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:79
+#: plugins/admin/systems/servdnseditzone.tpl:116
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 msgid "Save"
 msgstr ""
 
@@ -2177,7 +2180,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:25
 #: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:23
+#: plugins/admin/users/template.tpl:19
 msgid "Last name"
 msgstr ""
 
@@ -2187,7 +2190,7 @@ msgstr ""
 
 #: plugins/personal/generic/generic.tpl:37
 #: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:19
+#: plugins/admin/users/template.tpl:23
 msgid "First name"
 msgstr ""
 
@@ -2225,15 +2228,27 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:109
-#: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/admin/fai/class_faiManagement.inc:664
+#: plugins/admin/groups/class_groupManagement.inc:362
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/users/class_userManagement.inc:677
 #: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_applicationManagement.inc:332
 #: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
 #: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/admin/ogroups/class_ogroupManagement.inc:366
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 #: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
@@ -2249,7 +2264,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/admin/departments/generic.tpl:54
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:27 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:20 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
@@ -2294,7 +2309,7 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:388
+#: plugins/admin/groups/class_groupManagement.inc:391
 #: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/class_applicationManagement.inc:357
 #: plugins/admin/systems/class_systemManagement.inc:587
@@ -2470,7 +2485,7 @@ msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:919
-#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/addons/addressbook/class_addressbook.inc:545
 #: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Name' is not set."
 msgstr ""
@@ -2480,7 +2495,7 @@ msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/addons/addressbook/class_addressbook.inc:549
 #: plugins/admin/users/class_userManagement.inc:550
 msgid "The required field 'Given name' is not set."
 msgstr ""
@@ -2507,40 +2522,40 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:957
 #: plugins/personal/generic/class_user.inc:985
-#: plugins/addons/addressbook/class_addressbook.inc:556
-#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/addons/addressbook/class_addressbook.inc:583
 #: plugins/admin/departments/class_departmentGeneric.inc:176
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:960
 #: plugins/personal/generic/class_user.inc:982
-#: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/addons/addressbook/class_addressbook.inc:581
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:965
 #: plugins/personal/generic/class_user.inc:968
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:566
 #: plugins/admin/departments/class_departmentGeneric.inc:179
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:971
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:569
 #: plugins/admin/departments/class_departmentGeneric.inc:182
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:974
-#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:977
-#: plugins/addons/addressbook/class_addressbook.inc:576
+#: plugins/addons/addressbook/class_addressbook.inc:575
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
@@ -2642,7 +2657,7 @@ msgid "FTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:15
-#: plugins/admin/systems/glpi_devices.tpl:484
+#: plugins/admin/systems/glpi_devices.tpl:575
 msgid "Bandwidth"
 msgstr ""
 
@@ -2659,15 +2674,19 @@ msgstr ""
 msgid "Download bandwidth"
 msgstr ""
 
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Quota"
+msgstr ""
+
 #: plugins/personal/connectivity/pureftpd.tpl:39
 msgid "Files"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:43
-#: plugins/addons/mailqueue/contents.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:192
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:378
+#: plugins/addons/mailqueue/contents.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:283
+#: plugins/admin/systems/glpi_devices.tpl:406
+#: plugins/admin/systems/glpi_devices.tpl:469
 msgid "Size"
 msgstr ""
 
@@ -2926,7 +2945,7 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:49
+#: plugins/personal/connectivity/opengw.tpl:64
 msgid "Teams"
 msgstr ""
 
@@ -2934,19 +2953,19 @@ msgstr ""
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:136
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:141
+#: plugins/personal/connectivity/class_opengwAccount.inc:144
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:149
+#: plugins/personal/connectivity/class_opengwAccount.inc:152
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -2970,13 +2989,13 @@ msgid "Please specify a valid phone number."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/groups/class_groupManagement.inc:356
 #: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:326
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_glpiSelectUser.inc:138
+#: plugins/admin/systems/class_glpiSelectUser.inc:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
@@ -2984,14 +3003,14 @@ msgid "Go up one department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/fai/class_faiProfile.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiProfile.inc:286
+#: plugins/admin/groups/class_groupManagement.inc:356
 #: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:326
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_glpiSelectUser.inc:138
+#: plugins/admin/systems/class_glpiSelectUser.inc:144
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -3000,13 +3019,13 @@ msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/fai/class_faiManagement.inc:435
-#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/admin/fai/class_faiManagement.inc:632
+#: plugins/admin/groups/class_groupManagement.inc:357
 #: plugins/admin/users/class_userManagement.inc:671
 #: plugins/admin/applications/class_applicationManagement.inc:327
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_glpiSelectUser.inc:146
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3014,13 +3033,13 @@ msgid "Go to root department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/fai/class_faiManagement.inc:435
-#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/admin/fai/class_faiManagement.inc:632
+#: plugins/admin/groups/class_groupManagement.inc:357
 #: plugins/admin/users/class_userManagement.inc:671
 #: plugins/admin/applications/class_applicationManagement.inc:327
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_glpiSelectUser.inc:146
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
@@ -3028,11 +3047,11 @@ msgid "Root"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:355
+#: plugins/admin/groups/class_groupManagement.inc:358
 #: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:328
 #: plugins/admin/systems/class_systemManagement.inc:568
-#: plugins/admin/systems/class_glpiSelectUser.inc:142
+#: plugins/admin/systems/class_glpiSelectUser.inc:148
 #: plugins/admin/ogroups/class_ogroupManagement.inc:361
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
@@ -3040,13 +3059,13 @@ msgid "Go to users department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/fai/class_faiManagement.inc:438
-#: plugins/admin/groups/class_groupManagement.inc:355
+#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/groups/class_groupManagement.inc:358
 #: plugins/admin/users/class_userManagement.inc:672
 #: plugins/admin/applications/class_applicationManagement.inc:328
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:568
-#: plugins/admin/systems/class_glpiSelectUser.inc:142
+#: plugins/admin/systems/class_glpiSelectUser.inc:148
 #: plugins/admin/ogroups/class_ogroupManagement.inc:362
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
@@ -3061,22 +3080,9 @@ msgstr ""
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/fai/class_faiManagement.inc:467
-#: plugins/admin/groups/class_groupManagement.inc:359
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
-msgid "Current base"
-msgstr ""
-
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/fai/class_faiManagement.inc:468
-#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:665
+#: plugins/admin/groups/class_groupManagement.inc:363
 #: plugins/admin/users/class_userManagement.inc:678
 #: plugins/admin/applications/class_applicationManagement.inc:333
 #: plugins/admin/departments/class_departmentManagement.inc:284
@@ -3088,8 +3094,8 @@ msgid "Submit department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/fai/class_faiManagement.inc:468
-#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:665
+#: plugins/admin/groups/class_groupManagement.inc:363
 #: plugins/admin/users/class_userManagement.inc:678
 #: plugins/admin/applications/class_applicationManagement.inc:333
 #: plugins/admin/departments/class_departmentManagement.inc:284
@@ -3101,14 +3107,17 @@ msgid "Submit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/fai/class_faiManagement.inc:486
-#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/fai/class_faiManagement.inc:683
+#: plugins/admin/groups/class_groupManagement.inc:367
 #: plugins/admin/users/class_userManagement.inc:681
 #: plugins/admin/applications/class_applicationManagement.inc:337
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
-#: plugins/admin/systems/glpi.tpl:35
+#: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
@@ -3122,9 +3131,9 @@ msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/addons/mailqueue/contents.tpl:95
-#: plugins/admin/fai/class_faiManagement.inc:487
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/groups/class_groupManagement.inc:368
 #: plugins/admin/users/class_userManagement.inc:683
 #: plugins/admin/applications/class_applicationManagement.inc:338
 #: plugins/admin/departments/class_departmentManagement.inc:292
@@ -3148,12 +3157,13 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:483
-#: plugins/admin/groups/class_groupManagement.inc:390
+#: plugins/admin/fai/class_faiManagement.inc:680
+#: plugins/admin/groups/class_groupManagement.inc:393
 #: plugins/admin/users/class_userManagement.inc:692
 #: plugins/admin/applications/class_applicationManagement.inc:358
 #: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/systems/class_systemManagement.inc:588
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
 #: plugins/admin/ogroups/class_ogroupManagement.inc:393
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
@@ -3185,11 +3195,11 @@ msgstr ""
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:539
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:538
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:546
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
@@ -3212,10 +3222,10 @@ msgstr ""
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:13
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:385
-#: plugins/admin/systems/glpi_devices.tpl:433
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/admin/systems/glpi_devices.tpl:413
+#: plugins/admin/systems/glpi_devices.tpl:476
+#: plugins/admin/systems/glpi_devices.tpl:524
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr ""
@@ -3238,24 +3248,27 @@ msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/groups/remove.tpl:2 plugins/admin/users/remove.tpl:2
-#: plugins/admin/applications/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: plugins/gofon/conference/remove.tpl:2 html/index.php:227 html/index.php:287
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:233 html/index.php:293 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
 #: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
 #: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
@@ -3436,7 +3449,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:511
+#: plugins/admin/groups/class_groupApplication.inc:514
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
 msgid "back"
 msgstr ""
@@ -3463,55 +3476,55 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:6
+#: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:9
+#: plugins/gofax/faxreports/detail.tpl:8
 msgid "Click on fax to download"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:18
+#: plugins/gofax/faxreports/detail.tpl:17
 msgid "FAX ID"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:22
+#: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:589
+#: plugins/admin/systems/class_printGeneric.inc:649
 #: plugins/admin/ogroups/class_ogroupManagement.inc:481
 msgid "User"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:26
+#: plugins/gofax/faxreports/detail.tpl:25
 msgid "Date / Time"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:29
 msgid "Sender MSN"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:34
+#: plugins/gofax/faxreports/detail.tpl:33
 msgid "Sender ID"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:38
+#: plugins/gofax/faxreports/detail.tpl:37
 msgid "Receiver MSN"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:42
+#: plugins/gofax/faxreports/detail.tpl:41
 msgid "Receiver ID"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:50
+#: plugins/gofax/faxreports/detail.tpl:49
 msgid "Status message"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:54
+#: plugins/gofax/faxreports/detail.tpl:53
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:58
+#: plugins/gofax/faxreports/detail.tpl:57
 #: plugins/gofax/faxreports/contents.tpl:35
 msgid "# pages"
 msgstr ""
@@ -3563,7 +3576,7 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:12
+#: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
@@ -3592,8 +3605,8 @@ msgid "during"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/mailqueue/contents.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:27
+#: plugins/addons/mailqueue/contents.tpl:10
+#: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
@@ -3606,7 +3619,7 @@ msgid "Date"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:33
-#: plugins/addons/mailqueue/contents.tpl:58
+#: plugins/addons/mailqueue/contents.tpl:56
 msgid "Sender"
 msgstr ""
 
@@ -3632,12 +3645,12 @@ msgstr ""
 #: plugins/addons/addressbook/class_addressbook.inc:360
 #: plugins/addons/addressbook/class_addressbook.inc:367
 #: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:454
+#: plugins/addons/addressbook/class_addressbook.inc:453
 msgid "Dial"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
@@ -3647,19 +3660,23 @@ msgstr ""
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:6
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:49
-#: plugins/admin/systems/glpi_devices.tpl:102
-#: plugins/admin/systems/glpi_devices.tpl:156
-#: plugins/admin/systems/glpi_devices.tpl:212
-#: plugins/admin/systems/glpi_devices.tpl:274
-#: plugins/admin/systems/glpi_devices.tpl:344
-#: plugins/admin/systems/glpi_devices.tpl:406
-#: plugins/admin/systems/glpi_devices.tpl:450
-#: plugins/admin/systems/glpi_devices.tpl:501
-#: plugins/admin/systems/glpi_devices.tpl:553
-#: plugins/admin/systems/glpi_devices.tpl:597
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpi_devices.tpl:8
+#: plugins/admin/systems/glpi_devices.tpl:101
+#: plugins/admin/systems/glpi_devices.tpl:140
+#: plugins/admin/systems/glpi_devices.tpl:193
+#: plugins/admin/systems/glpi_devices.tpl:247
+#: plugins/admin/systems/glpi_devices.tpl:303
+#: plugins/admin/systems/glpi_devices.tpl:365
+#: plugins/admin/systems/glpi_devices.tpl:435
+#: plugins/admin/systems/glpi_devices.tpl:497
+#: plugins/admin/systems/glpi_devices.tpl:541
+#: plugins/admin/systems/glpi_devices.tpl:592
+#: plugins/admin/systems/glpi_devices.tpl:644
+#: plugins/admin/systems/glpi_devices.tpl:688
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr ""
@@ -3686,7 +3703,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:593
+#: plugins/admin/groups/class_groupApplication.inc:596
 msgid "Edit entry"
 msgstr ""
 
@@ -3772,24 +3789,24 @@ msgstr ""
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:466
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:473
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/mailqueue/class_mailqueue.inc:281
 #: plugins/addons/mailqueue/class_mailqueue.inc:346
 #: plugins/addons/logview/class_logview.inc:94
@@ -3797,35 +3814,35 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:514 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:515
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:515
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:516 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:174
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:516 html/getxls.php:80
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:597
+#: plugins/addons/addressbook/class_addressbook.inc:596
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:605
+#: plugins/addons/addressbook/class_addressbook.inc:604
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3843,7 +3860,7 @@ msgstr ""
 
 #: plugins/addons/addressbook/address_info.tpl:43
 #: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:52
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:45
 msgid "Email"
 msgstr ""
 
@@ -3918,7 +3935,7 @@ msgid "Un hold"
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:349
-#: plugins/addons/mailqueue/contents.tpl:78
+#: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
@@ -3926,107 +3943,107 @@ msgstr ""
 msgid "Not active"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:13
+#: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:15
+#: plugins/addons/mailqueue/contents.tpl:14
 msgid "Select a server"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:18
+#: plugins/addons/mailqueue/contents.tpl:17
 msgid "with status"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:22
+#: plugins/addons/mailqueue/contents.tpl:21
 msgid "within the last"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:30
+#: plugins/addons/mailqueue/contents.tpl:29
 msgid "Remove all messages"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/contents.tpl:30
 msgid "Remove all messages from selected servers queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:32
+#: plugins/addons/mailqueue/contents.tpl:31
 msgid "Hold all messages"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:32
 msgid "Hold all messages in selected servers queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:34
+#: plugins/addons/mailqueue/contents.tpl:33
 msgid "Release all messages"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/contents.tpl:34
 msgid "Release all messages in selected servers queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:36
+#: plugins/addons/mailqueue/contents.tpl:35
 msgid "Requeue all messages"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:37
+#: plugins/addons/mailqueue/contents.tpl:36
 msgid "Requeue all messages in selected servers queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:48
+#: plugins/addons/mailqueue/contents.tpl:46
 msgid "Search returned no results"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:54
+#: plugins/addons/mailqueue/contents.tpl:52
 msgid "ID"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:57
+#: plugins/addons/mailqueue/contents.tpl:55
 msgid "Arrival"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:59
+#: plugins/addons/mailqueue/contents.tpl:57
 msgid "Recipient"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:60
+#: plugins/addons/mailqueue/contents.tpl:58
 msgid "Error"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:95
+#: plugins/addons/mailqueue/contents.tpl:93
 msgid "Delete this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:99
+#: plugins/addons/mailqueue/contents.tpl:97
 msgid "unhold"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:99
+#: plugins/addons/mailqueue/contents.tpl:97
 msgid "Release message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:103
+#: plugins/addons/mailqueue/contents.tpl:101
 msgid "hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:103
+#: plugins/addons/mailqueue/contents.tpl:101
 msgid "Hold message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:107
+#: plugins/addons/mailqueue/contents.tpl:105
 msgid "requeue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:107
+#: plugins/addons/mailqueue/contents.tpl:105
 msgid "Requeue this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:110
+#: plugins/addons/mailqueue/contents.tpl:108
 msgid "header"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:110
+#: plugins/addons/mailqueue/contents.tpl:108
 msgid "Display header from this message"
 msgstr ""
 
@@ -4323,36 +4340,57 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/fai/tabsHook.inc:30 plugins/admin/fai/tabsPartition.inc:33
-#: plugins/admin/fai/tabsVariable.inc:30 plugins/admin/fai/tabsPackage.inc:30
-#: plugins/admin/fai/tabsProfile.inc:30 plugins/admin/fai/tabsScript.inc:30
-#: plugins/admin/fai/tabsTemplate.inc:30
-#: plugins/admin/departments/tabs_department.inc:30
+#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
+#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
+#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
+#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/tabs_department.inc:29
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:31
+#: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:32
+#: plugins/admin/fai/class_faiManagement.inc:33
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:204
+#: plugins/admin/fai/class_faiManagement.inc:226
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:210
-#: plugins/admin/fai/class_faiManagement.inc:249
+#: plugins/admin/fai/class_faiManagement.inc:232
+#: plugins/admin/fai/class_faiManagement.inc:270
 #: plugins/admin/systems/class_systemManagement.inc:413
 #: plugins/admin/systems/class_systemManagement.inc:478
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:402
-#: plugins/admin/fai/faiPackageNew.tpl:43 plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:315
+#: plugins/admin/fai/class_faiManagement.inc:421
+msgid "Specified branch name is invalid."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:321
+#: plugins/admin/fai/class_faiManagement.inc:427
+#: plugins/admin/systems/class_servRepository.inc:162
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+msgid "This name is already in use."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:375
+#, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:378
+msgid "You are not allowed to delete this release!"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:599
+#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -4364,114 +4402,114 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:438
+#: plugins/admin/fai/class_faiManagement.inc:635
 #: plugins/admin/departments/class_departmentManagement.inc:279
 msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:443
+#: plugins/admin/fai/class_faiManagement.inc:640
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:443
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:178
+#: plugins/admin/fai/class_faiManagement.inc:640
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:645
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:645
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:648
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:648
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:651
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:651
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:460
+#: plugins/admin/fai/class_faiManagement.inc:657
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:460
+#: plugins/admin/fai/class_faiManagement.inc:657
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:463
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:463
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:477
+#: plugins/admin/fai/class_faiManagement.inc:674
 #: plugins/admin/systems/class_systemManagement.inc:590
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:481
+#: plugins/admin/fai/class_faiManagement.inc:678
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:482
+#: plugins/admin/fai/class_faiManagement.inc:679
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:486
+#: plugins/admin/fai/class_faiManagement.inc:683
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:487
+#: plugins/admin/fai/class_faiManagement.inc:684
 msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:507
-#: plugins/admin/groups/class_groupApplication.inc:517
+#: plugins/admin/fai/class_faiManagement.inc:704
+#: plugins/admin/groups/class_groupApplication.inc:520
 #: plugins/admin/departments/class_departmentManagement.inc:315
 msgid "department"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:529
-#: plugins/admin/fai/class_faiManagement.inc:530
-#: plugins/admin/fai/class_faiProfile.inc:250
+#: plugins/admin/fai/class_faiManagement.inc:725
+#: plugins/admin/fai/class_faiManagement.inc:726
+#: plugins/admin/fai/class_faiProfile.inc:280
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:536
-#: plugins/admin/fai/class_faiManagement.inc:537
+#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:733
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:543
-#: plugins/admin/fai/class_faiManagement.inc:544
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:564
-#: plugins/admin/fai/class_faiManagement.inc:565
+#: plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Profile"
 msgstr ""
 
@@ -4540,17 +4578,17 @@ msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiPackageEntry.tpl:48 plugins/admin/fai/headpage.tpl:47
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:30
-#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/fai/faiPackageEntry.tpl:47 plugins/admin/fai/headpage.tpl:82
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
+#: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:59
-#: plugins/admin/fai/faiPackageEntry.tpl:53 plugins/admin/fai/headpage.tpl:51
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:34
-#: plugins/admin/systems/servRepository.tpl:40
+#: plugins/admin/fai/faiPackageEntry.tpl:51 plugins/admin/fai/headpage.tpl:86
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
+#: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr ""
@@ -4559,24 +4597,24 @@ msgstr ""
 msgid "Package"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
+#: plugins/admin/fai/class_faiScriptEntry.inc:62
+#: plugins/admin/fai/class_faiHookEntry.inc:64
 msgid "Please select a valid file."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:54
-#: plugins/admin/fai/class_faiHookEntry.inc:57
+#: plugins/admin/fai/class_faiScriptEntry.inc:65
+#: plugins/admin/fai/class_faiHookEntry.inc:67
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:99
+#: plugins/admin/fai/class_faiScriptEntry.inc:109
 #: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:112
+#: plugins/admin/fai/class_faiHookEntry.inc:122
 #: plugins/admin/fai/class_faiTemplateEntry.inc:164
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:103
+#: plugins/admin/fai/class_faiScriptEntry.inc:113
 msgid "Please enter a script."
 msgstr ""
 
@@ -4589,7 +4627,7 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:389
+#: plugins/admin/groups/class_groupManagement.inc:392
 #: plugins/admin/users/class_userManagement.inc:691
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
@@ -4613,31 +4651,31 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:285
+#: plugins/admin/fai/class_faiPackage.inc:291
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:295
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:310
+#: plugins/admin/fai/class_faiPackage.inc:316
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:334
+#: plugins/admin/fai/class_faiPackage.inc:340
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
 #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:188
+#: plugins/admin/systems/class_servRepository.inc:196
 msgid "Release"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:313
+#: plugins/admin/systems/class_printerPPDDialog.inc:319
 msgid "Section"
 msgstr ""
 
@@ -4653,53 +4691,53 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:243
+#: plugins/admin/fai/class_faiProfile.inc:272
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:245
+#: plugins/admin/fai/class_faiProfile.inc:275
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:246
+#: plugins/admin/fai/class_faiProfile.inc:276
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:247
+#: plugins/admin/fai/class_faiProfile.inc:277
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:248
+#: plugins/admin/fai/class_faiProfile.inc:278
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:249
+#: plugins/admin/fai/class_faiProfile.inc:279
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:252
+#: plugins/admin/fai/class_faiProfile.inc:283
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:255
+#: plugins/admin/fai/class_faiProfile.inc:287
 #: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:321
+#: plugins/admin/fai/class_faiProfile.inc:351
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:325
+#: plugins/admin/fai/class_faiProfile.inc:355
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:333
+#: plugins/admin/fai/class_faiProfile.inc:363
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
@@ -4882,47 +4920,67 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:36
+#: plugins/admin/fai/headpage.tpl:29
+msgid "Branches"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:35
+msgid "Current release"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:47
+msgid "Create new branch using the current release"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:51
+msgid "Create a locked version of the current release"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:56
+msgid "Delete current release"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:71
 msgid "Show profiles"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:37 plugins/admin/users/headpage.tpl:38
+#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
 msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:38
+#: plugins/admin/fai/headpage.tpl:73
 msgid "Show scripts"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:39
+#: plugins/admin/fai/headpage.tpl:74
 msgid "Show hooks"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:40
+#: plugins/admin/fai/headpage.tpl:75
 msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:41
+#: plugins/admin/fai/headpage.tpl:76
 msgid "Show packages"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:42
+#: plugins/admin/fai/headpage.tpl:77
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:226
-#: plugins/admin/fai/class_faiPartitionTable.inc:232
+#: plugins/admin/fai/class_faiPartitionTable.inc:231
+#: plugins/admin/fai/class_faiPartitionTable.inc:237
 #, php-format
 msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:228
-#: plugins/admin/fai/class_faiPartitionTable.inc:234
+#: plugins/admin/fai/class_faiPartitionTable.inc:233
+#: plugins/admin/fai/class_faiPartitionTable.inc:239
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:108
+#: plugins/admin/fai/class_faiHookEntry.inc:118
 msgid "Please enter a value for script."
 msgstr ""
 
@@ -4952,43 +5010,43 @@ msgstr ""
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:71
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:79
 msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:80
 msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:76
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:84
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:131
+#: plugins/admin/fai/class_askClassName.inc:137
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:135
+#: plugins/admin/fai/class_askClassName.inc:141
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -5020,9 +5078,12 @@ msgid "Choose class name"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
-#: plugins/admin/systems/class_glpiSelectUser.inc:95
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:150
+#: plugins/admin/systems/class_glpiSelectUser.inc:109
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:53
+#: plugins/admin/systems/glpiAttachmentPool.tpl:53
+#: plugins/admin/systems/glpiDeviceManagement.tpl:53
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 msgid "Use"
 msgstr ""
 
@@ -5067,7 +5128,8 @@ msgstr ""
 msgid "Template attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:122
+#: plugins/admin/fai/faiTemplateEntry.tpl:29
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:122
 msgid "File"
 msgstr ""
 
@@ -5078,6 +5140,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:95
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
 msgstr ""
 
@@ -5092,8 +5155,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:584
-#: plugins/admin/systems/class_printGeneric.inc:586
+#: plugins/admin/systems/class_printGeneric.inc:644
+#: plugins/admin/systems/class_printGeneric.inc:646
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -5104,6 +5167,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/systems/class_servDNS.inc:266
 msgid "Class"
 msgstr ""
 
@@ -5151,6 +5215,27 @@ msgstr ""
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
+#: plugins/admin/fai/faiNewBranch.tpl:3
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:9
+msgid "Please enter a name for the branch"
+msgstr ""
+
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr ""
@@ -5181,21 +5266,21 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:278
+#: plugins/admin/groups/class_groupManagement.inc:281
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:284
-#: plugins/admin/groups/class_groupManagement.inc:310
+#: plugins/admin/groups/class_groupManagement.inc:287
+#: plugins/admin/groups/class_groupManagement.inc:313
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/groups/class_groupManagement.inc:360
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:367
 #: plugins/admin/applications/class_applicationManagement.inc:337
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -5203,7 +5288,7 @@ msgstr ""
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:368
 #: plugins/admin/applications/class_applicationManagement.inc:338
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/ogroups/class_ogroupManagement.inc:372
@@ -5212,12 +5297,12 @@ msgstr ""
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:375
+#: plugins/admin/groups/class_groupManagement.inc:378
 #: plugins/admin/users/class_userManagement.inc:728
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:378
+#: plugins/admin/groups/class_groupManagement.inc:381
 #: plugins/admin/applications/class_applicationManagement.inc:348
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/gofon/fonreports/contents.tpl:34
@@ -5225,11 +5310,11 @@ msgstr ""
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:388
+#: plugins/admin/groups/class_groupManagement.inc:391
 msgid "Groupname"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:393
+#: plugins/admin/groups/class_groupManagement.inc:396
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/ogroups/class_ogroupManagement.inc:397
 msgid "This table displays all groups, in the selected tree."
@@ -5264,19 +5349,19 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
-#: plugins/admin/ogroups/class_ogroup.inc:541
+#: plugins/admin/groups/class_groupGeneric.inc:622
+#: plugins/admin/ogroups/class_ogroup.inc:618
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:636
+#: plugins/admin/groups/class_groupGeneric.inc:632
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:647
-#: plugins/admin/groups/class_groupGeneric.inc:654
+#: plugins/admin/groups/class_groupGeneric.inc:643
+#: plugins/admin/groups/class_groupGeneric.inc:650
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
@@ -5301,48 +5386,88 @@ msgid ""
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:159
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:227
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:160
+#: plugins/admin/groups/class_groupMail.inc:228
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:161
+#: plugins/admin/groups/class_groupMail.inc:229
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:162
+#: plugins/admin/groups/class_groupMail.inc:230
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:163
+#: plugins/admin/groups/class_groupMail.inc:231
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:188
+#: plugins/admin/groups/class_groupMail.inc:256
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:253
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:254
+#: plugins/admin/groups/class_groupMail.inc:322
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:625
+#: plugins/admin/groups/class_groupMail.inc:811
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:658
+#: plugins/admin/groups/class_groupMail.inc:844
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:662
+#: plugins/admin/groups/class_groupMail.inc:848
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -5351,7 +5476,7 @@ msgid "Object"
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpi.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
 msgid "Choose"
 msgstr ""
 
@@ -5461,66 +5586,66 @@ msgstr ""
 msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:295
+#: plugins/admin/groups/class_groupApplication.inc:294
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:302
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:304
+#: plugins/admin/groups/class_groupApplication.inc:303
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:305
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:307
+#: plugins/admin/groups/class_groupApplication.inc:306
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:319
+#: plugins/admin/groups/class_groupApplication.inc:318
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:327
+#: plugins/admin/groups/class_groupApplication.inc:326
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:389
+#: plugins/admin/groups/class_groupApplication.inc:392
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:425
+#: plugins/admin/groups/class_groupApplication.inc:428
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:525
+#: plugins/admin/groups/class_groupApplication.inc:528
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:556
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:559
+#: plugins/admin/groups/class_groupApplication.inc:595
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:560
-#: plugins/admin/groups/class_groupApplication.inc:590
+#: plugins/admin/groups/class_groupApplication.inc:563
+#: plugins/admin/groups/class_groupApplication.inc:593
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:561
-#: plugins/admin/groups/class_groupApplication.inc:591
+#: plugins/admin/groups/class_groupApplication.inc:564
+#: plugins/admin/groups/class_groupApplication.inc:594
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:588
+#: plugins/admin/groups/class_groupApplication.inc:591
 msgid "Insert seperator"
 msgstr ""
 
@@ -5533,7 +5658,7 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
 #: plugins/admin/systems/printer.tpl:65
-#: plugins/admin/systems/class_glpiSelectUser.inc:94 html/getxls.php:68
+#: plugins/admin/systems/class_glpiSelectUser.inc:108 html/getxls.php:68
 #: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr ""
@@ -5554,7 +5679,7 @@ msgid "You are not allowed to delete this user!"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:488
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:320
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
 #: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "none"
 msgstr ""
@@ -5650,17 +5775,6 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr ""
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -5728,7 +5842,18 @@ msgstr ""
 msgid "User administration"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
 msgid "Remove options"
 msgstr ""
 
@@ -5856,27 +5981,27 @@ msgstr ""
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:225
+#: plugins/admin/applications/class_applicationGeneric.inc:214
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:306
+#: plugins/admin/applications/class_applicationGeneric.inc:295
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:311
+#: plugins/admin/applications/class_applicationGeneric.inc:300
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:315
+#: plugins/admin/applications/class_applicationGeneric.inc:304
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:319
+#: plugins/admin/applications/class_applicationGeneric.inc:308
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:328
+#: plugins/admin/applications/class_applicationGeneric.inc:317
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
@@ -5998,8 +6123,8 @@ msgid " Please choose another name."
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:94
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:149
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Departments"
@@ -6040,9 +6165,9 @@ msgstr ""
 #: plugins/admin/systems/class_terminalInfo.inc:67
 #: plugins/admin/systems/class_terminalService.inc:139
 #: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_workstationService.inc:124
-#: plugins/admin/systems/class_workstationStartup.inc:233
-#: plugins/admin/systems/class_terminalGeneric.inc:130
+#: plugins/admin/systems/class_workstationService.inc:131
+#: plugins/admin/systems/class_workstationStartup.inc:234
+#: plugins/admin/systems/class_terminalGeneric.inc:128
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -6076,7 +6201,7 @@ msgid "offline"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+msgid "Network\tsettings"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:8
@@ -6087,28 +6212,55 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:51
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/network.tpl:28
+msgid "Domain name service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:142
-#: plugins/admin/systems/class_componentGeneric.inc:113
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/network.tpl:38
+msgid "Enable DNS for this device."
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:39
+#: plugins/admin/systems/servdnseditzone.tpl:55
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "Refresh"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:42
+msgid "DNS-Zone"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:156
-#: plugins/admin/systems/class_componentGeneric.inc:126
+#: plugins/admin/systems/network.tpl:50
+msgid "DNS-TTL"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:55
+#: plugins/admin/systems/servdnseditzone.tpl:98
+msgid "DNS Class"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:66
+#: plugins/admin/systems/servdnseditzone.tpl:107
+msgid "Records"
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:50
+msgid "This 'dn' has no network features."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:137
+#: plugins/admin/systems/class_componentGeneric.inc:120
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:166
-#: plugins/admin/systems/class_phoneGeneric.inc:307
-#: plugins/admin/systems/class_terminalGeneric.inc:260
+#: plugins/admin/systems/class_winGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:289
+#: plugins/admin/systems/class_terminalGeneric.inc:262
 #: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:221
-#: plugins/admin/systems/class_printGeneric.inc:458
-#: plugins/admin/systems/class_componentGeneric.inc:136
+#: plugins/admin/systems/class_workstationGeneric.inc:220
+#: plugins/admin/systems/class_printGeneric.inc:507
+#: plugins/admin/systems/class_componentGeneric.inc:130
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
@@ -6212,51 +6364,51 @@ msgid "GUI"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:83
-#: plugins/admin/systems/class_workstationService.inc:68
+#: plugins/admin/systems/class_workstationService.inc:69
 msgid "default"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:84
-#: plugins/admin/systems/class_workstationService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:70
 msgid "show chooser"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_workstationService.inc:71
 msgid "direct"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:88
-#: plugins/admin/systems/class_workstationService.inc:73
+#: plugins/admin/systems/class_workstationService.inc:74
 msgid "load balanced"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:76
+#: plugins/admin/systems/class_workstationService.inc:77
 msgid "Windows RDP"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:77
+#: plugins/admin/systems/class_workstationService.inc:78
 msgid "ICA client"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:187
-#: plugins/admin/systems/class_workstationService.inc:171
+#: plugins/admin/systems/class_workstationService.inc:178
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:248
 #: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:221
-#: plugins/admin/systems/class_workstationService.inc:226
+#: plugins/admin/systems/class_workstationService.inc:240
+#: plugins/admin/systems/class_workstationService.inc:245
 msgid "Please specify a valid VSync range."
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:263
 #: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:236
-#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_workstationService.inc:255
+#: plugins/admin/systems/class_workstationService.inc:260
 msgid "Please specify a valid HSync range."
 msgstr ""
 
@@ -6455,37 +6607,45 @@ msgstr ""
 msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:124
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:130
 #: plugins/admin/systems/terminalService.tpl:124
 msgid "HSync"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:126
+#: plugins/admin/systems/workstationService.tpl:132
 #: plugins/admin/systems/terminalService.tpl:126
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:129
+#: plugins/admin/systems/workstationService.tpl:135
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:131
+#: plugins/admin/systems/workstationService.tpl:137
 #: plugins/admin/systems/terminalService.tpl:131
 msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:143
+#: plugins/admin/systems/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:144
+#: plugins/admin/systems/workstationService.tpl:150
 #: plugins/admin/systems/terminalService.tpl:204
 msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:145
+#: plugins/admin/systems/workstationService.tpl:151
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr ""
@@ -6506,11 +6666,11 @@ msgstr ""
 msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:215
+#: plugins/admin/systems/class_workstationStartup.inc:216
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:269
+#: plugins/admin/systems/class_workstationStartup.inc:270
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -6538,96 +6698,76 @@ msgstr ""
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:216
+#: plugins/admin/systems/class_phoneGeneric.inc:213
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
+#: plugins/admin/systems/class_phoneGeneric.inc:269
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:276
+#: plugins/admin/systems/class_phoneGeneric.inc:272
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:279
-#: plugins/admin/systems/class_componentGeneric.inc:116
-msgid "The required field 'MAC-address' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:282
-#: plugins/admin/systems/class_componentGeneric.inc:119
-msgid "The required field 'IP-address' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:285
-msgid "Wrong IP format in field IP-address."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:290
-msgid ""
-"The given macaddress is invalid. There must be 6 2byte segments seperated by "
-"':'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:297
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:64
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:105
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
 #, php-format
 msgid ""
 "The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
 "informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:106
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
 msgid "Can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:122
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:135
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
 #, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:143
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
 #, php-format
 msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:162
-#: plugins/admin/systems/class_printerPPDDialog.inc:165
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
 msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:189
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
 msgid "Please select a valid ppd."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:363
-#: plugins/admin/systems/class_printerPPDDialog.inc:366
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:364
-#: plugins/admin/systems/class_printerPPDDialog.inc:367
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
@@ -6638,6 +6778,7 @@ msgstr ""
 
 #: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
 #: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr ""
@@ -6646,23 +6787,23 @@ msgstr ""
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_terminalGeneric.inc:61
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:64
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_terminalGeneric.inc:90
 #: plugins/admin/systems/class_servGeneric.inc:62
 #: plugins/admin/ogroups/class_termgroup.inc:62
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:96
-#: plugins/admin/systems/class_terminalGeneric.inc:108
-#: plugins/admin/systems/class_terminalGeneric.inc:120
+#: plugins/admin/systems/class_terminalGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:118
 #: plugins/admin/systems/class_servGeneric.inc:66
 #: plugins/admin/systems/class_servGeneric.inc:78
 #: plugins/admin/systems/class_servGeneric.inc:90
@@ -6674,44 +6815,44 @@ msgstr ""
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:102
 #: plugins/admin/systems/class_servGeneric.inc:74
 #: plugins/admin/ogroups/class_termgroup.inc:74
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_terminalGeneric.inc:114
 #: plugins/admin/systems/class_servGeneric.inc:86
 #: plugins/admin/ogroups/class_termgroup.inc:86
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_terminalGeneric.inc:145
 #: plugins/admin/systems/class_servGeneric.inc:115
 #: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_terminalGeneric.inc:145
 #: plugins/admin/systems/class_servGeneric.inc:115
 #: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:149
+#: plugins/admin/systems/class_terminalGeneric.inc:147
 #: plugins/admin/systems/class_servGeneric.inc:117
 #: plugins/admin/systems/class_workstationGeneric.inc:137
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:243
+#: plugins/admin/systems/class_terminalGeneric.inc:245
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:249
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
@@ -6720,7 +6861,7 @@ msgid "Printer driver"
 msgstr ""
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 msgid "Select"
 msgstr ""
 
@@ -6884,46 +7025,83 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:48
-#: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:87
-msgid "Close"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:124
+#: plugins/admin/systems/class_glpiAccount.inc:140
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:153
 msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:134
+#: plugins/admin/systems/class_glpiAccount.inc:150
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:163
 msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
+#: plugins/admin/systems/class_glpiAccount.inc:160
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:173
 msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:374
+#: plugins/admin/systems/class_glpiAccount.inc:174
+#: plugins/admin/systems/class_glpiAccount.inc:180
+#: plugins/admin/systems/class_glpiAccount.inc:186
+msgid "This feature is not implemented yet."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:283
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:303
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:314
+msgid "Rename failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:349
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:371
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:383
+msgid "Updating operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:515
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:196
 msgid "Remove inventory service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:375
+#: plugins/admin/systems/class_glpiAccount.inc:516
 msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:377
+#: plugins/admin/systems/class_glpiAccount.inc:518
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
 msgid "Add inventory service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:378
+#: plugins/admin/systems/class_glpiAccount.inc:519
 msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:420
-#: plugins/admin/systems/class_glpiAccount.inc:434
+#: plugins/admin/systems/class_glpiAccount.inc:582
+#: plugins/admin/systems/class_glpiAccount.inc:596
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:578
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:592
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
 msgid "N/A"
 msgstr ""
 
@@ -6965,11 +7143,11 @@ msgstr ""
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:204
+#: plugins/admin/systems/class_workstationGeneric.inc:203
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:208
+#: plugins/admin/systems/class_workstationGeneric.inc:207
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
@@ -7163,57 +7341,77 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_servDNS.inc:169
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:37
+#: plugins/admin/systems/class_servDNS.inc:170
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:39
+#: plugins/admin/systems/class_servDNS.inc:172
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:40
+#: plugins/admin/systems/class_servDNS.inc:173
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:138
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:164
-#: plugins/admin/systems/class_servDB.inc:174
-#: plugins/admin/systems/class_servDB.inc:179
-#: plugins/admin/systems/class_servDB.inc:185
+#: plugins/admin/systems/class_servDNS.inc:240
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:264
+msgid "Reverse zone"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:265
+#: plugins/admin/systems/servdnseditzone.tpl:73
+msgid "TTL"
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:135
+#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:161
+#: plugins/admin/systems/class_servDB.inc:171
+#: plugins/admin/systems/class_servDB.inc:176
+#: plugins/admin/systems/class_servDB.inc:182
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:154
+#: plugins/admin/systems/class_servDB.inc:151
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:155
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:169
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:193
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
+msgstr ""
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr ""
@@ -7222,27 +7420,36 @@ msgstr ""
 msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:105
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:125
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:111
+#: plugins/admin/systems/class_servNfs.inc:131
 msgid "Please specify a valid name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:114
+#: plugins/admin/systems/class_servNfs.inc:134
 msgid "Please specify a name for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:119
+#: plugins/admin/systems/class_servNfs.inc:139
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:123
+#: plugins/admin/systems/class_servNfs.inc:143
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:127
+#: plugins/admin/systems/class_servNfs.inc:147
 msgid "Option contains invalid characters."
 msgstr ""
 
@@ -7392,72 +7599,82 @@ msgstr ""
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:194
-#: plugins/admin/systems/class_printGeneric.inc:215
-#: plugins/admin/systems/class_printGeneric.inc:218
+#: plugins/admin/systems/class_printGeneric.inc:182
+#: plugins/admin/systems/class_printGeneric.inc:189
+#: plugins/admin/systems/class_printGeneric.inc:224
+#: plugins/admin/systems/class_printGeneric.inc:245
+#: plugins/admin/systems/class_printGeneric.inc:248
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:195
+#: plugins/admin/systems/class_printGeneric.inc:183
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:190
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:225
 msgid ""
 "This workstation has printer extension disabled. You can't enable it while "
 "'cn' is not present in entry. Possibly you are currently creating a new "
 "terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:207
-#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:240
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:208
+#: plugins/admin/systems/class_printGeneric.inc:238
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:241
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:216
+#: plugins/admin/systems/class_printGeneric.inc:246
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:219
+#: plugins/admin/systems/class_printGeneric.inc:249
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:230
+#: plugins/admin/systems/class_printGeneric.inc:260
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:364
+#: plugins/admin/systems/class_printGeneric.inc:396
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:372
+#: plugins/admin/systems/class_printGeneric.inc:404
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:384
+#: plugins/admin/systems/class_printGeneric.inc:416
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:386
+#: plugins/admin/systems/class_printGeneric.inc:418
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:448
+#: plugins/admin/systems/class_printGeneric.inc:497
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
@@ -7759,6 +7976,10 @@ msgstr ""
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+msgid "The required field 'Component name' is not set."
+msgstr ""
+
 #: plugins/admin/systems/terminalStartup.tpl:35
 msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
@@ -7807,8 +8028,8 @@ msgid "Parent server"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:189
-#: plugins/admin/systems/class_servRepository.inc:210
+#: plugins/admin/systems/class_servRepository.inc:197
+#: plugins/admin/systems/class_servRepository.inc:218
 msgid "Sections"
 msgstr ""
 
@@ -7840,29 +8061,112 @@ msgid ""
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:154
-msgid "This name is already in use."
-msgstr ""
-
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:20
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr ""
+
+#: plugins/admin/systems/servRepository.tpl:29
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:197
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:238
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:271
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:252
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:719
+msgid "since"
+msgstr ""
+
 #: plugins/admin/systems/glpi_edit_type.tpl:7
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 #: plugins/admin/systems/glpi_edit_os.tpl:7
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 msgid "Rename"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:13
-#: plugins/admin/systems/glpi_edit_os.tpl:13
-msgid "close"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:122
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:52
+#: plugins/admin/systems/glpi.tpl:63 plugins/admin/systems/glpi_devices.tpl:15
+msgid "Comments"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: plugins/admin/systems/glpi_devices.tpl:108
+#: plugins/admin/systems/glpi_devices.tpl:147
+#: plugins/admin/systems/glpi_devices.tpl:200
+#: plugins/admin/systems/glpi_devices.tpl:254
+#: plugins/admin/systems/glpi_devices.tpl:310
+#: plugins/admin/systems/glpi_devices.tpl:372
+#: plugins/admin/systems/glpi_devices.tpl:442
+#: plugins/admin/systems/glpi_devices.tpl:504
+#: plugins/admin/systems/glpi_devices.tpl:548
+#: plugins/admin/systems/glpi_devices.tpl:599
+#: plugins/admin/systems/glpi_devices.tpl:651
+#: plugins/admin/systems/glpi_devices.tpl:695
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+msgid "Comment"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:22
+#: plugins/admin/systems/glpi_devices.tpl:119
+#: plugins/admin/systems/glpi_devices.tpl:158
+#: plugins/admin/systems/glpi_devices.tpl:211
+#: plugins/admin/systems/glpi_devices.tpl:265
+#: plugins/admin/systems/glpi_devices.tpl:321
+#: plugins/admin/systems/glpi_devices.tpl:383
+#: plugins/admin/systems/glpi_devices.tpl:453
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:559
+#: plugins/admin/systems/glpi_devices.tpl:610
+#: plugins/admin/systems/glpi_devices.tpl:662
+#: plugins/admin/systems/glpi_devices.tpl:706
+msgid "Manufacturer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
 msgid "use"
 msgstr ""
 
@@ -7871,25 +8175,104 @@ msgid ""
 "This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:20
+#: plugins/admin/systems/class_termDNS.inc:239
+msgid "The required field 'MAC-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:244
+msgid "The required field 'IP-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:250
+msgid "Wrong IP format in field IP-address."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:256
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:262
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+msgstr ""
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:13
 msgid "Website"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:38
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:31
 #: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:59
-#: plugins/admin/systems/glpi.tpl:79
-msgid "Comments"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:24
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Display cartridge types matching"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:83
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:39
+msgid "Regular expression for matching cartridge types"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
 msgid "Please specify a name."
 msgstr ""
 
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:24
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Display attachments matching"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:39
+msgid "Regular expression for matching attachment names"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
+msgstr ""
+
 #: plugins/admin/systems/glpi.tpl:9
 msgid "System type"
 msgstr ""
@@ -7898,321 +8281,524 @@ msgstr ""
 msgid "Operating system"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpi_devices.tpl:28
-#: plugins/admin/systems/glpi_devices.tpl:67
-#: plugins/admin/systems/glpi_devices.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:174
-#: plugins/admin/systems/glpi_devices.tpl:230
-#: plugins/admin/systems/glpi_devices.tpl:292
-#: plugins/admin/systems/glpi_devices.tpl:362
-#: plugins/admin/systems/glpi_devices.tpl:424
-#: plugins/admin/systems/glpi_devices.tpl:468
-#: plugins/admin/systems/glpi_devices.tpl:519
-#: plugins/admin/systems/glpi_devices.tpl:571
-#: plugins/admin/systems/glpi_devices.tpl:615
-msgid "Manufacturer"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:39
-msgid "Technical responsible"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:78
 msgid "Installed devices"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:60
+#: plugins/admin/systems/glpi.tpl:90
 msgid "Trading"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:61
+#: plugins/admin/systems/glpi.tpl:91
 msgid "Software"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:62
+#: plugins/admin/systems/glpi.tpl:92
 msgid "Contracts"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:66
-msgid "Contacts"
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:70
-msgid "Contact person"
+#: plugins/admin/systems/servdnseditzone.tpl:1
+msgid "Zone settings"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:74
-msgid "mailto"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:87
-msgid "Attachments"
+#: plugins/admin/systems/servdnseditzone.tpl:17
+msgid "Subnet"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "SOA record for this zone"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:24
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+#: plugins/admin/systems/servdnseditzone.tpl:33
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Display devices matching"
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:39
-msgid "Regular expression for matching device names"
-msgstr ""
-
-#: plugins/admin/systems/glpi_devices.tpl:4
-msgid "Other devices"
+#: plugins/admin/systems/servdnseditzone.tpl:61
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:17
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:109
-#: plugins/admin/systems/glpi_devices.tpl:163
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:281
-#: plugins/admin/systems/glpi_devices.tpl:351
-#: plugins/admin/systems/glpi_devices.tpl:413
-#: plugins/admin/systems/glpi_devices.tpl:457
-#: plugins/admin/systems/glpi_devices.tpl:508
-#: plugins/admin/systems/glpi_devices.tpl:560
-#: plugins/admin/systems/glpi_devices.tpl:604
-msgid "Comment"
+#: plugins/admin/systems/servdnseditzone.tpl:67
+msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:43
-msgid "Power supply"
+#: plugins/admin/systems/servdnseditzone.tpl:91
+msgid "DNS TTL"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Atx"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:79
-#: plugins/admin/systems/glpi_devices.tpl:195
-#: plugins/admin/systems/glpi_devices.tpl:258
-msgid "Yes"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:24
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:80
-#: plugins/admin/systems/glpi_devices.tpl:196
-#: plugins/admin/systems/glpi_devices.tpl:259
-msgid "No"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Display devices matching"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:84
-msgid "Power"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:39
+msgid "Regular expression for matching device names"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:96
-msgid "Gfxcard"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:129
-#: plugins/admin/systems/glpi_devices.tpl:183
-#: plugins/admin/systems/glpi_devices.tpl:246
-msgid "Interface"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Ram"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:150
-msgid "Controllers"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:206
-msgid "Drive"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:239
-msgid "Speed"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:255
-msgid "Writeable"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:268
-msgid "Hdd"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:301
-msgid "Rpm"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:308
-msgid "Cache"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:338
-msgid "RAM"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-#: plugins/admin/systems/glpi_devices.tpl:528
-msgid "Frequenz"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:400
-msgid "Soundcard"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:444
-msgid "Network interface"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:477
-msgid "MAC address"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:495
-msgid "Processor"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:535
-msgid "Default frequenz"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:547
-msgid "Motherboard"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:580
-msgid "Chipset"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:591
-msgid "Computer case"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:624
-msgid "format"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:87
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "New monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:149
-msgid "devices"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "M"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:176
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "New mainbord"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:178
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "New processor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:180
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "New case"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:180
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:182
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "New network interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:182
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "NI"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:184
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "New ram"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:184
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:186
-msgid "New hard disk drive"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:186
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-msgid "New drives"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 msgid "D"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:190
-msgid "New controllers"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:190
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:194
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "New sound card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:194
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:196
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
 msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:196
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
 msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:198
-msgid "New other peripherals"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:198
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:283
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
 msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:294
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:297
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
 msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:333
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
 msgid "Other"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:151
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Monitor"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:31
+msgid "Monitor size"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:34
+msgid "Inch"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:42
+msgid "Integrated microphone"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:45
+#: plugins/admin/systems/glpi_devices.tpl:53
+#: plugins/admin/systems/glpi_devices.tpl:61
+#: plugins/admin/systems/glpi_devices.tpl:69
+#: plugins/admin/systems/glpi_devices.tpl:170
+#: plugins/admin/systems/glpi_devices.tpl:286
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Yes"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:46
+#: plugins/admin/systems/glpi_devices.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:62
+#: plugins/admin/systems/glpi_devices.tpl:70
+#: plugins/admin/systems/glpi_devices.tpl:171
+#: plugins/admin/systems/glpi_devices.tpl:287
+#: plugins/admin/systems/glpi_devices.tpl:350
+msgid "No"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:50
+msgid "Integrated speakers"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:58
+msgid "Sub-D"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:66
+msgid "BNC"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:74
+msgid "Serial number"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:81
+msgid "Additional serial number"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:95
+msgid "Other devices"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:134
+msgid "Power supply"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:167
+msgid "Atx"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:175
+msgid "Power"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:187
+msgid "Gfxcard"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:220
+#: plugins/admin/systems/glpi_devices.tpl:274
+#: plugins/admin/systems/glpi_devices.tpl:337
+msgid "Interface"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:229
+msgid "Ram"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:241
+msgid "Controllers"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:297
+msgid "Drive"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:330
+msgid "Speed"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:346
+msgid "Writeable"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:359
+msgid "Hdd"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:392
+msgid "Rpm"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:399
+msgid "Cache"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:429
+msgid "RAM"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:462
+msgid "Frequenz"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:491
+msgid "Soundcard"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:535
+msgid "Network interface"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:568
+msgid "MAC address"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:586
+msgid "Processor"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:619
+msgid "Frequence"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:626
+msgid "Default frequence"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:638
+msgid "Motherboard"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:671
+msgid "Chipset"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:682
+msgid "Computer case"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:715
+msgid "format"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:149
+msgid "This zoneName is already in use"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:152
+msgid "This reverse zone is already in use"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:58
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:84
-#: plugins/admin/ogroups/tabs_ogroups.inc:131
+#: plugins/admin/ogroups/tabs_ogroups.inc:83
+#: plugins/admin/ogroups/tabs_ogroups.inc:130
 msgid "Terminals"
 msgstr ""
 
@@ -8385,15 +8971,15 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:410
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "Non existing dn: "
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/ogroups/class_ogroup.inc:611
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:551
+#: plugins/admin/ogroups/class_ogroup.inc:628
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
@@ -8600,12 +9186,6 @@ msgstr ""
 msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
 #: plugins/admin/ogroups/phonequeue.tpl:62
 msgid "Strategy"
 msgstr ""
@@ -9019,10 +9599,6 @@ msgstr ""
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr ""
-
 #: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
 msgstr ""
@@ -9378,333 +9954,341 @@ msgid "Support for phpgroupware enabled"
 msgstr ""
 
 #: include/functions_setup.inc:221
-msgid "Support for gofon disabled, no schema seems to be installed"
+msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
 
 #: include/functions_setup.inc:226
-msgid "Support for gofon enabled"
+msgid "Support for trustAccount enabled"
 msgstr ""
 
 #: include/functions_setup.inc:231
-msgid "Support for nagios disabled, no schema seems to be installed"
+msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 
 #: include/functions_setup.inc:236
-msgid "Support for nagios enabled"
+msgid "Support for gofon enabled"
+msgstr ""
+
+#: include/functions_setup.inc:241
+msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 
 #: include/functions_setup.inc:246
+msgid "Support for nagios enabled"
+msgstr ""
+
+#: include/functions_setup.inc:256
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:253
+#: include/functions_setup.inc:263
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:271
+#: include/functions_setup.inc:281
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:274
+#: include/functions_setup.inc:284
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:276
+#: include/functions_setup.inc:286
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:304
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:295
+#: include/functions_setup.inc:305
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
 msgstr ""
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:308
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:309
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk. GOsa will run in both modes."
 msgstr ""
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:312
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:306
+#: include/functions_setup.inc:316
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:317
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:310
+#: include/functions_setup.inc:320
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:311
+#: include/functions_setup.inc:321
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:314
+#: include/functions_setup.inc:324
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:315
+#: include/functions_setup.inc:325
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:328
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:329
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:322
+#: include/functions_setup.inc:332
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:333
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:326
+#: include/functions_setup.inc:336
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:327
+#: include/functions_setup.inc:337
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:340
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:341
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:334
+#: include/functions_setup.inc:344
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:335
+#: include/functions_setup.inc:345
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:348
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:339
+#: include/functions_setup.inc:349
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:342
+#: include/functions_setup.inc:352
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:343
+#: include/functions_setup.inc:353
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:379
+#: include/functions_setup.inc:389
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:393
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:384
+#: include/functions_setup.inc:394
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:395
+#: include/functions_setup.inc:405
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:414
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:408
+#: include/functions_setup.inc:418
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:419
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:416
+#: include/functions_setup.inc:426
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:417
+#: include/functions_setup.inc:427
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:432
+#: include/functions_setup.inc:442
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:433
+#: include/functions_setup.inc:443
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:446
+#: include/functions_setup.inc:456
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:457
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:450
+#: include/functions_setup.inc:460
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:451
+#: include/functions_setup.inc:461
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:458
+#: include/functions_setup.inc:468
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:459
+#: include/functions_setup.inc:469
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:476
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:467
+#: include/functions_setup.inc:477
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:471
+#: include/functions_setup.inc:481
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:472
+#: include/functions_setup.inc:482
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:722
+#: include/functions_setup.inc:732
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:731 include/functions_setup.inc:814
+#: include/functions_setup.inc:741 include/functions_setup.inc:824
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:745 include/functions_setup.inc:819
-#: include/functions_setup.inc:824
+#: include/functions_setup.inc:755 include/functions_setup.inc:829
+#: include/functions_setup.inc:834
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:844
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
 msgstr ""
 
-#: include/functions_setup.inc:890
+#: include/functions_setup.inc:900
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:921
+#: include/functions_setup.inc:931
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:930
+#: include/functions_setup.inc:940
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1040 include/functions_setup.inc:1063
-#: include/functions_setup.inc:1072 html/index.php:172
+#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
+#: include/functions_setup.inc:1082 html/index.php:178
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -9832,7 +10416,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:326
+#: include/php_setup.inc:71 html/main.php:347
 msgid "Toggle information"
 msgstr ""
 
@@ -9939,30 +10523,30 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1005
+#: include/functions.inc:1008
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1104
+#: include/functions.inc:1107
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1282
+#: include/functions.inc:1285
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1310
+#: include/functions.inc:1313
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1584
+#: include/functions.inc:1587
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1627
+#: include/functions.inc:1630
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -9990,34 +10574,39 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:195 html/index.php:136
+#: include/class_config.inc:195 html/index.php:141
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:445
+#: include/class_config.inc:448
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_ldap.inc:437
+#: include/class_ldap.inc:479
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr ""
+
+#: include/class_ldap.inc:590
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:699
+#: include/class_ldap.inc:852
 #, 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:712
+#: include/class_ldap.inc:865
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:728
+#: include/class_ldap.inc:881
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -10151,34 +10740,34 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 
-#: html/index.php:145
+#: html/index.php:151
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:153
+#: html/index.php:159
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:180
+#: html/index.php:186
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:182
+#: html/index.php:188
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:189
+#: html/index.php:195
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:227 html/index.php:287
+#: html/index.php:233 html/index.php:293
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:227 html/index.php:287
+#: html/index.php:233 html/index.php:293
 msgid "Enter SSL session"
 msgstr ""
 
@@ -10203,27 +10792,57 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:149
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:192
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:325
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:326
+#: html/main.php:347
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
 msgstr ""
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr ""
+
+#: html/get_attachment.php:47
+msgid ""
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
+msgstr ""
+
+#: html/get_attachment.php:55
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
+msgstr ""
+
+#: html/get_attachment.php:64
+msgid "Can't get specified attachment file, there is no entry with this id."
+msgstr ""
+
+#: html/get_attachment.php:69
+#, php-format
+msgid "Can't open file '%s'."
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""