Fixed Translation Strings.

[gosa.git] / locale / fr / LC_MESSAGES / messages.po

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 60da7d508e1b49728c61aeb9dc5622197b1ecfb8..851a155127c1704c9334f820f3a564870bf9121a 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,4 +1,15 @@
-# translation of messages.po to 
+# translation of messages.po to Français
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
+# translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to
@@ -18,17 +29,18 @@
 # translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to French
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005.
+# Benoit Mortier <benoit.mortier@opensides.be>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"PO-Revision-Date: 2005-11-20 12:29+0100\n"
+"PO-Revision-Date: 2006-01-21 23:05+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team:  <fr@li.org>\n"
+"Language-Team: Français <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: contrib/gosa.conf:4
 msgid "My account"
@@ -38,22 +50,21 @@ msgstr "Mon Compte"
 msgid "Administration"
 msgstr "Administration"
 
-#: contrib/gosa.conf:51
+#: contrib/gosa.conf:57
 msgid "Addons"
 msgstr "Extensions"
 
-#: 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:127 contrib/gosa.conf:136
-#: contrib/gosa.conf:141 contrib/gosa.conf:146 contrib/gosa.conf:151
-#: contrib/gosa.conf:156 contrib/gosa.conf:161
+#: 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
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
 #: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -62,150 +73,171 @@ msgstr "Extensions"
 #: 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/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 "Informations"
 
-#: contrib/gosa.conf:71
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: 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:378
-#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/groups/class_groupManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:730
 msgid "Environment"
 msgstr "Environnement"
 
-#: 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:374
-#: plugins/admin/users/class_userManagement.inc:731
-#: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:161
-#: plugins/admin/ogroups/class_ogroupManagement.inc:383
+#: plugins/admin/groups/class_groupManagement.inc:379
+#: plugins/admin/users/class_userManagement.inc:732
+#: 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 "Messagerie"
 
-#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:737
+#: 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 "Samba"
 
-#: contrib/gosa.conf:75 plugins/personal/connectivity/main.inc:135
+#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Connectivité"
 
-#: contrib/gosa.conf:76 plugins/personal/generic/generic.tpl:241
-#: plugins/personal/generic/generic.tpl:372
+#: 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:735
-#: plugins/admin/departments/generic.tpl:62 html/getxls.php:174
+#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:38 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:77 plugins/personal/generic/generic.tpl:224
-#: plugins/personal/generic/generic.tpl:362
-#: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/address_edit.tpl:96
+#: 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/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
+#: 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
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:709
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Téléphone"
 
-#: 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 "Nagios"
 
-#: 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:123 contrib/gosa.conf:132 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: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 "Références"
 
-#: 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 "Applications"
 
-#: contrib/gosa.conf:87
+#: contrib/gosa.conf:93
 msgid "ACL"
 msgstr "ACL"
 
-#: 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:198
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr "Options"
 
-#: 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 "Paramètres"
 
-#: contrib/gosa.conf:110 contrib/gosa.conf:128
-#: 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 "Démarrage"
 
-#: contrib/gosa.conf:111 contrib/gosa.conf:129
-#: 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 "Périphériques"
 
-#: contrib/gosa.conf:112 contrib/gosa.conf:130
-#: plugins/personal/environment/environment.tpl:168
-#: plugins/admin/systems/class_systemManagement.inc:714
+#: 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
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: plugins/admin/ogroups/class_ogroupManagement.inc:489
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Imprimante"
 
-#: contrib/gosa.conf:113 contrib/gosa.conf:122 contrib/gosa.conf:131
+#: 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
-#: plugins/admin/fai/faiProfileEntry.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
+#: 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 "Information"
 
-#: contrib/gosa.conf:119
+#: contrib/gosa.conf:125
 msgid "Databases"
 msgstr "Base de données"
 
-#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Services"
 
-#: contrib/gosa.conf:177 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:128 plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+msgid "Repository"
+msgstr "Dépôt"
+
+#: contrib/gosa.conf:179
+msgid "OGo"
+msgstr "OGo"
+
+#: 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
@@ -214,86 +246,86 @@ msgstr "Services"
 msgid "Export"
 msgstr "Exporter"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:192
 msgid "Excel Export"
 msgstr "Exporter en Excel"
 
-#: contrib/gosa.conf:179 plugins/personal/mail/generic.tpl:112
+#: 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:117
-#: plugins/addons/ldapmanager/contentcsv.tpl:120
-#: plugins/admin/applications/generic.tpl:91
+#: plugins/addons/ldapmanager/contentcsv.tpl:109
+#: plugins/addons/ldapmanager/contentcsv.tpl:112
+#: plugins/admin/applications/generic.tpl:94
 msgid "Import"
 msgstr "Importer"
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:194
 msgid "CSV Import"
 msgstr "Importer un fichier CSV"
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:198
 msgid "Partitions"
 msgstr "Partitions"
 
-#: contrib/gosa.conf:188 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:89
+#: plugins/admin/applications/generic.tpl:92
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:192 plugins/admin/fai/class_faiManagement.inc:551
-#: plugins/admin/fai/class_faiManagement.inc:552
+#: contrib/gosa.conf:206 plugins/admin/fai/class_faiManagement.inc:753
+#: plugins/admin/fai/class_faiManagement.inc:754
 msgid "Hooks"
 msgstr "Connexions"
 
-#: contrib/gosa.conf:196 plugins/admin/fai/class_faiManagement.inc:544
-#: plugins/admin/fai/class_faiManagement.inc:545
+#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:746
+#: plugins/admin/fai/class_faiManagement.inc:747
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:200 plugins/admin/fai/class_faiManagement.inc:565
-#: plugins/admin/fai/class_faiManagement.inc:566
+#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:767
+#: plugins/admin/fai/class_faiManagement.inc:768
 msgid "Templates"
 msgstr "Modèles"
 
-#: contrib/gosa.conf:204 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:218 plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr "Profils"
 
-#: contrib/gosa.conf:208
+#: contrib/gosa.conf:222
 msgid "Packages"
 msgstr "Paquets"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:242
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:243 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:260 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Allemand"
 
-#: contrib/gosa.conf:244
+#: contrib/gosa.conf:261
 msgid "Russian"
 msgstr "Russe"
 
-#: contrib/gosa.conf:245
+#: contrib/gosa.conf:262
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: contrib/gosa.conf:246
+#: contrib/gosa.conf:263
 msgid "French"
 msgstr "Français"
 
-#: contrib/gosa.conf:247
+#: contrib/gosa.conf:264
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:265
 msgid "English"
 msgstr "Anglais"
 
-#: contrib/gosa.conf:249
+#: contrib/gosa.conf:266
 msgid "Italian"
 msgstr "Italien"
 
@@ -311,20 +343,20 @@ msgstr "Italien"
 #: plugins/personal/connectivity/class_phpgwAccount.inc:6
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_glpiAccount.inc:26
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
 #: plugins/addons/addressbook/class_addressbook.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/ldapmanager/class_csvimport.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/ldapmanager/class_import.inc:7
 #: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
@@ -334,7 +366,7 @@ msgstr "Italien"
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
@@ -386,25 +418,25 @@ msgstr ""
 #: plugins/personal/environment/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:115
+#: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:390
-#: plugins/admin/groups/class_groupManagement.inc:331
-#: plugins/admin/users/class_userManagement.inc:632
+#: 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:350
-#: plugins/admin/systems/class_systemManagement.inc:539
-#: plugins/admin/ogroups/class_ogroupManagement.inc:339
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:303
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:272
+#: plugins/admin/departments/class_departmentManagement.inc:347
+#: plugins/admin/systems/class_systemManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
 msgid "Finish"
 msgstr "Terminé"
 
 #: 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
@@ -418,48 +450,61 @@ msgstr "Terminé"
 #: plugins/personal/generic/generic_picture.tpl:31
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:117
+#: plugins/personal/connectivity/main.inc:120
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:392
-#: plugins/admin/fai/class_faiManagement.inc:397
-#: plugins/admin/fai/faiProfileEntry.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:234
+#: 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:66
+#: plugins/admin/fai/faiPackageNew.tpl:45
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:66 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:133
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: 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:634
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:16
+#: plugins/admin/users/class_userManagement.inc:635
+#: 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
-#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/departments/class_departmentManagement.inc:349
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:541
-#: plugins/admin/systems/servnfs.tpl:92 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/class_systemManagement.inc:542
+#: 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/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:341
+#: plugins/admin/ogroups/class_ogroupManagement.inc:340
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
-#: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:274
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
@@ -469,9 +514,9 @@ msgstr "Annuler"
 #: plugins/personal/posix/main.inc:120 plugins/personal/samba/main.inc:114
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
-#: plugins/personal/connectivity/main.inc:125
+#: plugins/personal/connectivity/main.inc:128
 #: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
+#: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Cliquez sur le bouton 'Edit' ci-dessous pour changer les informations dans "
@@ -479,10 +524,10 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
-#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
@@ -490,8 +535,15 @@ 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/gofon/phoneaccount/main.inc:112
+#: plugins/admin/systems/printer.tpl:46 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: 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 "Editer"
 
@@ -504,11 +556,11 @@ msgid "Nagios Account"
 msgstr "Compte Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
 msgid "Alias"
-msgstr "Alias"
+msgstr "Alias de l'utilisateur"
 
-#: 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 "Adresse de messagerie"
 
@@ -529,9 +581,9 @@ msgid "Host notification options"
 msgstr "Options pour la notification des systèmes"
 
 #: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:235
-#: plugins/addons/addressbook/address_edit.tpl:102
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:242
+#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Pager"
 msgstr "Bip"
@@ -558,15 +610,15 @@ msgstr "voir les informations de configuration"
 
 #: plugins/personal/nagios/nagios.tpl:75
 msgid "trigger system commands"
-msgstr "Permettre le commandes systêmes"
+msgstr "Permettre les commandes systêmes"
 
 #: plugins/personal/nagios/nagios.tpl:78
 msgid "view all services"
-msgstr "voir tout les services"
+msgstr "Voir tout les services"
 
 #: plugins/personal/nagios/nagios.tpl:81
 msgid "view all hosts"
-msgstr "voir tout les hôtes"
+msgstr "Voir tout les hôtes"
 
 #: plugins/personal/nagios/nagios.tpl:83
 msgid "trigger all service commands"
@@ -582,55 +634,55 @@ msgid "Primary address"
 msgstr "Adresse principale"
 
 #: plugins/personal/mail/generic.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:32 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:709
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: 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
 msgid "Server"
 msgstr "Serveur"
 
-#: plugins/personal/mail/generic.tpl:13
+#: plugins/personal/mail/generic.tpl:14
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Indiquez le serveur de messagerie de l'utilisateur"
 
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Utilisation des Quota"
 
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:150
-#: plugins/admin/systems/class_printGeneric.inc:367
+#: 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:401
 msgid "not defined"
 msgstr "non défini"
 
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr "Taille des Quota"
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:45
+#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
 #: plugins/admin/systems/phonesettings.tpl:170
 #: plugins/admin/systems/phonesettings.tpl:185
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de messagerie alternatives"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: 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
-#: plugins/personal/samba/samba3.tpl:307
+#: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:117
-#: plugins/personal/environment/environment.tpl:134
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/environment/environment.tpl:137
+#: plugins/personal/environment/environment.tpl:181
+#: 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
@@ -638,40 +690,52 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:74
-#: plugins/admin/fai/class_faiProfile.inc:153
-#: plugins/admin/fai/faiProfile.tpl:37 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:61
+#: 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:408
-#: plugins/admin/groups/application.tpl:14
+#: 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
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:53
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/workstationStartup.tpl:92
+#: 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/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:39
+#: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Ajouter"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:309
-#: plugins/personal/environment/environment.tpl:135
-#: plugins/personal/environment/environment.tpl:162
-#: plugins/personal/environment/environment.tpl:178
+#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:166
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -679,117 +743,127 @@ msgstr "Ajouter"
 #: 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:38
-#: 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
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/workstationStartup.tpl:54
-#: plugins/admin/systems/workstationStartup.tpl:74
+#: plugins/admin/systems/workstationStartup.tpl:51
+#: plugins/admin/systems/workstationStartup.tpl:71
 #: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
+#: 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_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
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Supprimer"
 
-#: plugins/personal/mail/generic.tpl:66
+#: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr "Options de messagerie"
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 "Sélectionnez ceci si vous souhaitez relayer les messages sans garder de "
 "copie de ceux-ci"
 
-#: plugins/personal/mail/generic.tpl:71
+#: plugins/personal/mail/generic.tpl:72
 msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Indiquez la réponse automatique en remplissant le message d'absence ci-"
 "dessous"
 
-#: plugins/personal/mail/generic.tpl:74
+#: plugins/personal/mail/generic.tpl:75
 msgid "Activate vacation message"
 msgstr "Activer la notification d'absence"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Sélectionner ceci si vous voulez que spamassassin filtre les mails"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:82
 msgid "Move mails tagged with spam level greater than"
 msgstr "Déplacer les messages ayant un niveau de spam supérieur à"
 
-#: plugins/personal/mail/generic.tpl:83
+#: plugins/personal/mail/generic.tpl:84
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Sélectionnez le niveau de spam - une valeur basse implique une plus grande "
 "sélectivité"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:87
 msgid "to folder"
 msgstr "vers le répertoire"
 
-#: plugins/personal/mail/generic.tpl:93
+#: plugins/personal/mail/generic.tpl:94
 msgid "Reject mails bigger than"
 msgstr "Rejeter les messages plus gros que"
 
-#: plugins/personal/mail/generic.tpl:95
-#: plugins/personal/environment/environment.tpl:71
-#: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/mail/generic.tpl:96
+#: 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:227
 msgid "MB"
 msgstr "MB"
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:102
 msgid "Vacation message"
 msgstr "Message d'absence"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:119
 msgid "Forward messages to"
 msgstr "Transférer les messages vers"
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:130
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 msgid "Add local"
 msgstr "Ajouter en local"
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr "Options de messagerie avancées"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Sélectionnez si vous voulez que les utilisateurs puissent envoyer et "
 "recevoir des messages uniquement dans son propre domaine"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:146
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 "Les utilisateurs ne sont autorisés qu'à envoyer et recevoir des messages "
 "locaux"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "Use custom sieve script"
 msgstr "Utiliser des scripts sieve personnalisés"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:153
 msgid "disables all Mail options!"
 msgstr "désactive toutes les options de messagerie!"
 
@@ -801,22 +875,22 @@ msgstr ""
 "Il n'y a pas de méthode de messagerie correspondante à la méthode '%s' "
 "spécifiée dans votre fichier de configuration gosa.conf."
 
-#: plugins/personal/mail/class_mailAccount.inc:163
+#: plugins/personal/mail/class_mailAccount.inc:170
 msgid "No DESC tag in vacation file:"
 msgstr "Pas de drapeau DESC dans le message d'absence:"
 
-#: plugins/personal/mail/class_mailAccount.inc:203
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "This account has no mail extensions."
 msgstr "Ce compte n'a pas d'extensions de messagerie."
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/personal/mail/class_mailAccount.inc:219
+#: plugins/admin/groups/class_groupMail.inc:264
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Supprimer le compte de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:213
-#: plugins/admin/groups/class_groupMail.inc:191
+#: plugins/personal/mail/class_mailAccount.inc:220
+#: plugins/admin/groups/class_groupMail.inc:265
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -824,14 +898,14 @@ msgstr ""
 "L'extension de messagerie est activée pour ce compte, vous pouvez la "
 "désactiver en cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/mail/class_mailAccount.inc:215
-#: plugins/admin/groups/class_groupMail.inc:193
+#: plugins/personal/mail/class_mailAccount.inc:222
+#: plugins/admin/groups/class_groupMail.inc:267
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Créer un compte de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:215
-#: plugins/admin/groups/class_groupMail.inc:194
+#: plugins/personal/mail/class_mailAccount.inc:222
+#: plugins/admin/groups/class_groupMail.inc:268
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -839,21 +913,21 @@ msgstr ""
 "L'extension de messagerie est désactivée pour ce compte, vous pouvez "
 "l'activer en cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/mail/class_mailAccount.inc:263
+#: plugins/personal/mail/class_mailAccount.inc:270
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
 "renvoi."
 
-#: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:253
+#: plugins/personal/mail/class_mailAccount.inc:276
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Utiliser une de vos adresses comme adresse de renvoi n'a pas de sens."
 
-#: plugins/personal/mail/class_mailAccount.inc:304
-#: plugins/personal/mail/class_mailAccount.inc:309
-#: plugins/admin/groups/class_groupMail.inc:281
+#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:355
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -861,57 +935,57 @@ msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
 "adresses alternatives."
 
-#: plugins/personal/mail/class_mailAccount.inc:319
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/personal/mail/class_mailAccount.inc:326
+#: plugins/admin/groups/class_groupMail.inc:360
 msgid "The address you're trying to add is already used by user"
 msgstr "L'adresse entrée est déjà utilisée par un utilisateur"
 
-#: plugins/personal/mail/class_mailAccount.inc:693
+#: plugins/personal/mail/class_mailAccount.inc:700
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Il n'y a pas de serveur de messagerie valide spécifié, veuillez en ajouter "
 "un dans la configuration système."
 
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/admin/groups/class_groupMail.inc:614
+#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/admin/groups/class_groupMail.inc:808
 msgid "The required field 'Primary address' is not set."
 msgstr "Le champ obligatoire 'Adresse Principale' n'est pas rempli."
 
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/personal/mail/class_mailAccount.inc:706
-#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/personal/mail/class_mailAccount.inc:713
+#: 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 ""
 "Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
 "Principale'."
 
-#: plugins/personal/mail/class_mailAccount.inc:713
-#: plugins/admin/groups/class_groupMail.inc:623
+#: 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 "L'adresse principale entrée est déjà utilisée."
 
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:629
+#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/admin/groups/class_groupMail.inc:823
 msgid "Value in 'Quota size' is not valid."
 msgstr "La valeur dans le champ 'Taille du quota' n'est pas valide."
 
-#: plugins/personal/mail/class_mailAccount.inc:728
-#: plugins/admin/groups/class_groupMail.inc:638
+#: 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 ""
 "Veuillez indiquer une taille valide pour les messages devant être rejetés."
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-#: plugins/admin/groups/class_groupMail.inc:646
+#: 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 ""
 "Il est nécessaire d'indiquer une taille maximale des messages afin de "
 "pouvoir en rejeter certains."
 
-#: plugins/personal/mail/class_mailAccount.inc:742
+#: plugins/personal/mail/class_mailAccount.inc:748
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 "Vous avez activé les réglages antispam, mais aucun dossier de destination "
@@ -934,16 +1008,21 @@ msgstr "Sélectionner les adresses à ajouter"
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/fai/faiProfileEntry.tpl:32
-#: plugins/admin/fai/faiPackageEntry.tpl:34 plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/faiProfileEntry.tpl:31
+#: 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: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
 #: plugins/gofon/conference/headpage.tpl:29
@@ -951,7 +1030,7 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: 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
@@ -982,10 +1061,10 @@ msgid "User name of which addresses are shown"
 msgstr "Utilisateur dont on montre les adresses"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:660
+#: plugins/admin/systems/class_systemManagement.inc:661
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
@@ -995,7 +1074,7 @@ msgstr "Mot de passe"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -1036,6 +1115,7 @@ msgstr "Confirmation du nouveau mot de passe"
 
 #: 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 "Attribuer le mot de passe"
@@ -1053,11 +1133,12 @@ msgstr ""
 "qui l'utilisent."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
+#: plugins/personal/generic/main.inc:169
+#: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
+#: plugins/addons/ldapmanager/contentcsv.tpl:114
+#: 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
@@ -1119,82 +1200,27 @@ msgstr ""
 msgid "Select groups to add"
 msgstr "Sélectionner les groupes à ajouter"
 
-#: 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 ""
-"Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
-"d'utilisateurs"
-
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Show primary groups"
-msgstr "Afficher les groupes de base"
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:44
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Sélectionnez afin d'afficher les groupes Samba"
-
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:45
-msgid "Show samba groups"
-msgstr "Afficher les groupes Samba"
-
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:48
-msgid "Select to see groups that have applications configured"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
-
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
-msgid "Show application groups"
-msgstr "Afficher les groupes applications"
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:52
-msgid "Select to see groups that have mail settings"
-msgstr "Sélectionnez afin d'afficher les groupes ayant la messagerie activée"
-
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:53
-msgid "Show mail groups"
-msgstr "Afficher les groupes ayant la messagerie activé"
-
-#: 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 ""
-"Sélectionnez afin d'afficher les groupes normaux ayant uniquement un aspect "
-"fonctionnel"
-
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:57
-msgid "Show functional groups"
-msgstr "Afficher les groupes fonctionnels"
-
-#: plugins/personal/posix/posix_groups.tpl:36
 msgid "Display groups of department"
 msgstr "Afficher les groupes du département"
 
-#: 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 "Afficher les groupes correspondants"
 
-#: 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 "Expression régulière correspondant à des noms de groupe"
 
-#: 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 "Afficher les groupes contenant des utilisateurs"
 
-#: 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 "Utilisateur dont on montre les groupes"
 
@@ -1204,7 +1230,7 @@ msgstr ""
 "L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:245
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
@@ -1222,8 +1248,8 @@ msgid "Display systems matching"
 msgstr "Afficher les systèmes correspondant"
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:85
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:638
 msgid "Home directory"
 msgstr "Répertoire Home"
 
@@ -1235,8 +1261,11 @@ msgstr "Shell"
 msgid "Primary group"
 msgstr "Groupe principal"
 
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+#: plugins/personal/posix/generic.tpl:29
+#: 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 "Statut"
 
@@ -1277,32 +1306,33 @@ msgstr "Mode de confiance"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:137
+#: plugins/personal/posix/class_posixAccount.inc:970
 msgid "Group of user"
 msgstr "Groupe d'utilisateurs"
 
-#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:177
 msgid "unconfigured"
 msgstr "non configuré"
 
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: 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_workstationService.inc:114
+#: plugins/admin/systems/class_workstationStartup.inc:466
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
 msgid "automatic"
 msgstr "automatique"
 
-#: plugins/personal/posix/class_posixAccount.inc:222
+#: plugins/personal/posix/class_posixAccount.inc:227
 msgid "This account has no unix extensions."
 msgstr "Ce compte n'a pas d'extension unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:243
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:251
 msgid "Remove posix account"
 msgstr "Supprimer le compte posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: 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."
@@ -1310,7 +1340,7 @@ msgstr ""
 "Ce compte possède l'extension unix. Pour le désactiver vous devez au "
 "préalable supprimer le(s) compte samba / environnement."
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:252
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1318,11 +1348,11 @@ msgstr ""
 "Ce compte possède l'extension posix. Vous pouvez le supprimer en cliquant "
 "sur le bouton ci-dessous."
 
-#: plugins/personal/posix/class_posixAccount.inc:250
+#: plugins/personal/posix/class_posixAccount.inc:255
 msgid "Create posix account"
 msgstr "Créer un compte posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:256
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1330,259 +1360,259 @@ msgstr ""
 "Aucune extension posix n'existe pour ce compte. Vous pouvez en créer une en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:440
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Les mots de passe ne peuvent être changé qu'après %s jours à compter de la "
 "dernière modification de celui-ci"
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Le mot de passe doit être changé après %s jours"
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Désactiver le compte après %s jours d'inactivité après l'expiration du mot "
 "de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:446
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Janvier"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Février"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "Mars"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:409
 #: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/reports/class_faxreport.inc:286
-#: plugins/gofon/reports/class_fonreport.inc:217
+#: plugins/gofax/faxreports/class_faxreport.inc:76
+#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "Avril"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Mai"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Juin"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Juillet"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:287
-#: plugins/gofon/reports/class_fonreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:77
+#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "Aôut"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:410
 #: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "Septembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Octobre"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "Novembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: 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
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:242
-#: plugins/gofax/reports/class_faxreport.inc:288
-#: plugins/gofon/reports/class_fonreport.inc:219
+#: plugins/gofax/faxreports/class_faxreport.inc:78
+#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Décembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: 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 "désactivé"
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:554
 msgid "full access"
 msgstr "accès complet"
 
-#: plugins/personal/posix/class_posixAccount.inc:549
+#: plugins/personal/posix/class_posixAccount.inc:555
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/personal/posix/class_posixAccount.inc:718
+#: plugins/personal/posix/class_posixAccount.inc:725
 msgid "Failed: overriding lock"
 msgstr "Échoué: réécriture du verrou"
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:884
 msgid "The required field 'Home directory' is not set."
 msgstr "Le champ obligatoire 'Répertoire Home' n'est pas renseigné."
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:887
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Veuillez indiquer un chemin d'accès valide dans le champ 'Répertoire Home'."
 
-#: plugins/personal/posix/class_posixAccount.inc:888
+#: plugins/personal/posix/class_posixAccount.inc:895
 msgid "Value specified as 'UID' is not valid."
 msgstr "La valeur de l''UID' spécifiée n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:898
 msgid "Value specified as 'UID' is too small."
 msgstr "La valeur de l''UID' spécifiée est trop petite."
 
-#: plugins/personal/posix/class_posixAccount.inc:895
-#: plugins/admin/groups/class_groupGeneric.inc:657
+#: plugins/personal/posix/class_posixAccount.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:658
 msgid "Value specified as 'GID' is not valid."
 msgstr "La valeur du 'GID' n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:898
-#: plugins/admin/groups/class_groupGeneric.inc:660
+#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/admin/groups/class_groupGeneric.inc:661
 msgid "Value specified as 'GID' is too small."
 msgstr "La valeur spécifiée comme 'GID' est trop petite."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:913
 #, fuzzy
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "La valeur de 'shadowMin' spécifiée n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:918
 #, fuzzy
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "La valeur de 'shadowMax' spécifiée n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:923
 #, fuzzy
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "La valeur de 'shadowWarning' spécifiée n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:926
 #, fuzzy
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sans 'shadowMax' n'a pas de sens."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:929
 #, fuzzy
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "La valeur de 'shadowWarning' doit être inférieure à celle de 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/personal/posix/class_posixAccount.inc:932
 #, fuzzy
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "La valeur de 'shadowWarning' doit être supérieure à celle de 'shadowMin'."
 
-#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/personal/posix/class_posixAccount.inc:937
 #, fuzzy
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "La valeur de 'shadowInactive' spécifiée n'est pas valide."
 
-#: plugins/personal/posix/class_posixAccount.inc:933
+#: plugins/personal/posix/class_posixAccount.inc:940
 #, fuzzy
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sans 'shadowMax' n'a pas de sens."
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:945
 #, fuzzy
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "La valeur pour 'shadowMin' doit être inférieure à celle de 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:1042
-#: plugins/admin/groups/class_groupGeneric.inc:691
+#: 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 "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
@@ -1599,22 +1629,22 @@ msgid "Script path"
 msgstr "Chemin du Script"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:95
-#: plugins/personal/samba/class_sambaAccount.inc:634
+#: plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/class_sambaAccount.inc:639
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:230
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
 msgid "Access options"
 msgstr "Options d'accès"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:236
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
 msgid "Allow user to change password from client"
 msgstr ""
 "Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
 "cliente"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:239
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
 msgid "Login from windows client requires no password"
 msgstr ""
 "L'identification sur une station windows ne nécessite pas de mot de passe"
@@ -1631,93 +1661,91 @@ msgstr "Domaine"
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
-#: plugins/personal/samba/samba3.tpl:82
+#: plugins/personal/samba/samba3.tpl:91
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
-#: plugins/personal/samba/samba3.tpl:107
+#: plugins/personal/samba/samba3.tpl:118
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
-#: plugins/personal/samba/samba3.tpl:110
+#: plugins/personal/samba/samba3.tpl:121
 msgid "Initial program"
 msgstr "Programme initial"
 
-#: plugins/personal/samba/samba3.tpl:116
-#, fuzzy
+#: plugins/personal/samba/samba3.tpl:131
 msgid "Working directory"
 msgstr "Répertoire de travail"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:153
 msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
-#: plugins/personal/samba/samba3.tpl:136
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/samba3.tpl:158
+#: plugins/personal/samba/class_sambaAccount.inc:646
 msgid "Connection"
 msgstr "Connexion"
 
-#: plugins/personal/samba/samba3.tpl:145
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/samba3.tpl:167
+#: plugins/personal/samba/class_sambaAccount.inc:647
 msgid "Disconnection"
 msgstr "Déconnexion"
 
-#: plugins/personal/samba/samba3.tpl:154
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:176
+#: plugins/personal/samba/class_sambaAccount.inc:648
 msgid "IDLE"
 msgstr "En attente"
 
-#: plugins/personal/samba/samba3.tpl:167
+#: plugins/personal/samba/samba3.tpl:189
 msgid "Client devices"
 msgstr "Périphériques clients"
 
-#: plugins/personal/samba/samba3.tpl:172
+#: plugins/personal/samba/samba3.tpl:194
 msgid "Connect client drives at logon"
 msgstr "Connecter les lecteurs clients à l'identification"
 
-#: plugins/personal/samba/samba3.tpl:178
+#: plugins/personal/samba/samba3.tpl:200
 msgid "Connect client printers at logon"
 msgstr "Connecter les imprimantes clients à l'identification"
 
-#: plugins/personal/samba/samba3.tpl:184
+#: plugins/personal/samba/samba3.tpl:206
 msgid "Default to main client printer"
 msgstr "Imprimante par défaut"
 
-#: plugins/personal/samba/samba3.tpl:194
-#: plugins/personal/connectivity/pureftpd.tpl:64
+#: plugins/personal/samba/samba3.tpl:216
+#: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/personal/samba/samba3.tpl:198
-#, fuzzy
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Shadowing"
 msgstr "Masquer"
 
-#: plugins/personal/samba/samba3.tpl:207
+#: plugins/personal/samba/samba3.tpl:229
 msgid "On broken or timed out"
 msgstr "Sur interrompu ou temps d'attente dépassé"
 
-#: plugins/personal/samba/samba3.tpl:215
+#: plugins/personal/samba/samba3.tpl:237
 msgid "Reconnect if disconnected"
 msgstr "Reconnexion si déconnecté"
 
-#: plugins/personal/samba/samba3.tpl:242
+#: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
-#: plugins/personal/samba/samba3.tpl:257
+#: plugins/personal/samba/samba3.tpl:279
 msgid "Limit Logon Time"
 msgstr "Limiter les temps d'accès"
 
-#: plugins/personal/samba/samba3.tpl:269
+#: plugins/personal/samba/samba3.tpl:291
 msgid "Limit Logoff Time"
 msgstr "Limiter les heures de deconnections"
 
-#: plugins/personal/samba/samba3.tpl:281
+#: plugins/personal/samba/samba3.tpl:304
 msgid "Account expires after"
 msgstr "Le compte expire après"
 
-#: plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/samba3.tpl:324
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
@@ -1802,12 +1830,12 @@ msgstr "de n'importe quel client"
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: plugins/personal/samba/class_sambaAccount.inc:636
+#: plugins/personal/samba/class_sambaAccount.inc:641
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "La valeur spécifiée comme '%s' contient des caractères invalides!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:651
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1815,7 +1843,7 @@ msgstr ""
 "La propriété temps d'attente '%s' est activée et contient des caractères "
 "invalides ou ne contient rien!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/class_sambaAccount.inc:657
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1823,7 +1851,7 @@ msgstr ""
 "Le gestionnaire d'utilisateurs windows accepte seulement huit clients. Vous "
 "en avez spécifiés plus de huit."
 
-#: plugins/personal/samba/class_sambaAccount.inc:836
+#: plugins/personal/samba/class_sambaAccount.inc:841
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1831,7 +1859,7 @@ msgstr ""
 "Attention: Ce compte possède un samba SID non assigné: Le problème ne peut "
 "pas être fixé par GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:865
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1864,7 +1892,7 @@ msgid "Please select an entry or press cancel."
 msgstr "Veuillez sélectionner une entrée ou cliquez sur annuler."
 
 #: 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 "Veuillez sélectionner une imprimante ou cliquez sur annuler."
 
@@ -1887,6 +1915,7 @@ msgstr "Sélectionner le département où sera effectuée la recherche"
 #: plugins/personal/environment/hotplugDialog.tpl:43
 #: plugins/admin/groups/group_objects.tpl:38
 #: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/systems/glpiSelectUser.tpl:37
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Afficher les utilisateurs correspondants"
@@ -1896,53 +1925,58 @@ msgid "Regular expression for        matching hotplugs"
 msgstr ""
 "Expression régulière concordant avec les noms des périphériques hotplug"
 
-#: 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 "Enlever l'extension d'environnement"
 
-#: 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 ""
-"Ce serveur à l'extension d'environnement activée. Vous pouvez la désactiver "
-"en cliquant sur le bouton ci-dessous."
+"Extension d'environnement activée. Vous pouvez la désactiver en cliquant sur "
+"le bouton ci-dessous."
 
-#: 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 "Ajouter une extension d'environnement"
 
-#: 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 ""
-"Ce serveur à l'extension d'environnement désactivé. Vous pouvez l'activer en "
-"cliquant sur le bouton ci-dessous."
+"Extension d'environnement désactivé. Vous pouvez l'activer en cliquant sur "
+"le bouton ci-dessous."
 
-#: 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 ""
-"Ce serveur à l'extension d'environnement désactivée. Vous devez d'abord "
-"créer un compte posix avant de pouvoir activer cette extension."
+"Extension d'environnement désactivée. Vous devez d'abord créer un compte "
+"posix avant de pouvoir activer cette extension."
+
+#: plugins/personal/environment/class_environment.inc:404
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "None"
+msgstr "Aucun"
 
-#: plugins/personal/environment/class_environment.inc:485
-#: plugins/personal/environment/class_environment.inc:487
+#: 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:280
+#: plugins/admin/systems/class_workstationStartup.inc:364
 msgid "You must specify a valid mount point."
 msgstr "Veuillez indiquer un point de montage valide."
 
-#: plugins/personal/environment/class_environment.inc:716
+#: plugins/personal/environment/class_environment.inc:743
 msgid "Please set a valid profile quota size."
 msgstr "Veuillez indiquer un quota valide pour le profil."
 
-#: plugins/personal/environment/class_environment.inc:723
+#: plugins/personal/environment/class_environment.inc:750
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
@@ -1950,23 +1984,23 @@ msgstr ""
 "Vous devez configurer correctement l'extension posix pour activer "
 "l'extension d'environnement."
 
-#: plugins/personal/environment/class_environment.inc:745
+#: plugins/personal/environment/class_environment.inc:772
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 "Impossible de sauver de nouveaux profiles kiosk, je n'ai pas les droits sur "
 "le répertoire"
 
-#: plugins/personal/environment/class_environment.inc:838
+#: plugins/personal/environment/class_environment.inc:865
 msgid "Error while writing printer"
 msgstr "Une erreur s'est produite lors de la sauvegarde de l'imprimante"
 
-#: plugins/personal/environment/class_environment.inc:908
+#: plugins/personal/environment/class_environment.inc:935
 msgid "Error while writing printer settings"
 msgstr ""
 "Une erreur s'est produite lors de la sauvegarde des paramètres de "
 "l'imprimante"
 
-#: plugins/personal/environment/class_environment.inc:1030
+#: plugins/personal/environment/class_environment.inc:1059
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -1993,8 +2027,8 @@ msgid "The environment extension is currently disabled."
 msgstr "L'extension d'environnement est actuellement désactivée."
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:100
-#: plugins/personal/environment/environment.tpl:146
+#: plugins/personal/environment/environment.tpl:102
+#: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr "Paramètres des préférences d'environnement"
 
@@ -2014,101 +2048,102 @@ msgstr "Gestion des profiles serveurs"
 msgid "Profil path"
 msgstr "Chemin du Profil"
 
-#: plugins/personal/environment/environment.tpl:42
+#: plugins/personal/environment/environment.tpl:40
+msgid "Profil quota"
+msgstr "Quota du profil"
+
+#: plugins/personal/environment/environment.tpl:54
 msgid "Cache profile localy"
 msgstr "Cacher le profile en local"
 
-#: plugins/personal/environment/environment.tpl:51
+#: plugins/personal/environment/environment.tpl:63
 msgid "Kiosk profile settings"
 msgstr "Paramètres du profil Kiosk"
 
-#: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/environment.tpl:66
 msgid "Kiosk profile"
 msgstr "Profil Kiosk"
 
-#: plugins/personal/environment/environment.tpl:60
+#: plugins/personal/environment/environment.tpl:72
 msgid "Manage"
 msgstr "Gérer"
 
-#: plugins/personal/environment/environment.tpl:65
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Quota"
-
-#: plugins/personal/environment/environment.tpl:79
+#: plugins/personal/environment/environment.tpl:81
 msgid "Resolution changeable on runtime"
 msgstr "La résolution peut être changée lors de l'execution"
 
-#: plugins/personal/environment/environment.tpl:84
+#: plugins/personal/environment/environment.tpl:86
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Résolution"
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/admin/systems/workstationStartup.tpl:78
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Shares"
 msgstr "Partages"
 
-#: plugins/personal/environment/environment.tpl:116
-#: plugins/admin/systems/workstationStartup.tpl:91
+#: plugins/personal/environment/environment.tpl:118
+#: plugins/admin/systems/workstationStartup.tpl:88
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr "Point de montage"
 
-#: plugins/personal/environment/environment.tpl:118
-#: plugins/personal/environment/kioskManagement.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: 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:75
+#: plugins/admin/fai/faiPackage.tpl:62
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
-#: plugins/admin/groups/class_groupMail.inc:412
-#: plugins/admin/applications/class_applicationParameters.inc:97
-#: plugins/admin/systems/workstationStartup.tpl:93
-#: plugins/admin/systems/printer.tpl:47
+#: 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/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 "Supprimer"
 
-#: plugins/personal/environment/environment.tpl:124
+#: plugins/personal/environment/environment.tpl:127
 msgid "Logon scripts"
 msgstr "Scripts de démarrage"
 
-#: plugins/personal/environment/environment.tpl:125
+#: plugins/personal/environment/environment.tpl:128
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "Administration des scripts de démarrage"
 
-#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:152
 msgid "Hotplug devices"
 msgstr "Périphériques Hotplug"
 
-#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:153
 msgid "Hotplug device settings"
 msgstr "Paramètre des périphériques Hotplug"
 
-#: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/groups/class_groupManagement.inc:355
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/personal/environment/environment.tpl:164
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "New"
 msgstr "Nouveau"
 
-#: plugins/personal/environment/environment.tpl:161
+#: plugins/personal/environment/environment.tpl:165
 msgid "Existing"
 msgstr "Existant"
 
-#: plugins/personal/environment/environment.tpl:169
+#: plugins/personal/environment/environment.tpl:173
 msgid "Printer settings"
 msgstr "Paramètres de l'imprimante"
 
-#: plugins/personal/environment/environment.tpl:179
+#: plugins/personal/environment/environment.tpl:183
 msgid "Admin Toggle"
-msgstr "Switch Administrateur"
+msgstr "Mode Administrateur"
 
 #: plugins/personal/environment/class_logonManagementDialog.inc:96
 msgid "Specified name is invalid."
@@ -2174,38 +2209,42 @@ msgid "Logon script"
 msgstr "Script de démarrage"
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/personal/environment/kioskManagement.tpl:24
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: 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:65
+#: plugins/admin/fai/faiPackageEntry.tpl:61
 #: plugins/admin/fai/faiHookEntry.tpl:69
-#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: 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 include/functions.inc:1276
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/systems/servRepositorySetup.tpl:41
 msgid "Apply"
 msgstr "Appliquer"
 
-#: 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 "Impossible d'effacer '%s'. L'erreur est: permission interdite."
 
-#: 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 "Impossible d'effacer '%s'. L'erreur est: le fichier n'existe pas."
 
-#: 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 ""
 "La variable KIOSPATH n'est pas définie dans votre gosa.conf. Impossible de "
 "gérer des profiles kiosk!"
 
-#: 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 ""
@@ -2238,12 +2277,23 @@ msgstr "Sauvegarder"
 msgid "Kiosk profile management"
 msgstr "Gérer les profil Kiosk"
 
-#: 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 "Parcourir"
 
+#: 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 "Fermer"
+
 #: plugins/personal/environment/main.inc:124
 msgid "User environment settings"
 msgstr "Utiliser les préférences d'environnement"
@@ -2268,9 +2318,14 @@ msgid "Remove picture"
 msgstr "Suppression de l'image personnelle"
 
 #: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
+#: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/admin/systems/servnfs.tpl:75
+#: 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 "Enregistrer"
 
@@ -2282,232 +2337,236 @@ msgstr "Informations personnelles"
 msgid "Change picture"
 msgstr "Changer la photo"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: 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
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Nom"
+#: plugins/personal/generic/generic.tpl:25
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/admin/users/template.tpl:19
+msgid "Last name"
+msgstr "Nom de famille"
 
 #: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/admin/users/template.tpl:23 html/getxls.php:65 html/getxls.php:174
-#: html/getxls.php:224 html/getxls.php:236
-msgid "Given name"
+msgid "Template name"
+msgstr "Nom du modèle"
+
+#: plugins/personal/generic/generic.tpl:37
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:23
+msgid "First name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
 msgid "Login"
 msgstr "Identifiant"
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/personal/generic/generic.tpl:49
 #: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/addons/addressbook/address_edit.tpl:54
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/generic.tpl:50
+#: plugins/personal/generic/generic.tpl:57
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/generic.tpl:58
+#: plugins/personal/generic/generic.tpl:65
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:82
 #: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Activer"
 
-#: plugins/personal/generic/generic.tpl:81 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/generic.tpl:91
+#: plugins/personal/generic/generic.tpl:98
 msgid "Preferred langage"
 msgstr "Langue préferée"
 
-#: plugins/personal/generic/generic.tpl:102
-#: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:109
+#: 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:22 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 "Base"
 
-#: plugins/personal/generic/generic.tpl:106
+#: plugins/personal/generic/generic.tpl:113
 msgid "Choose subtree to place user in"
 msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
 
-#: plugins/personal/generic/generic.tpl:121
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_edit.tpl:93
+#: plugins/personal/generic/generic.tpl:128
+#: plugins/personal/generic/generic.tpl:272
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:54 html/getxls.php:174
+#: 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:20 html/getxls.php:174
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/generic.tpl:125
+#: plugins/personal/generic/generic.tpl:132
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/generic.tpl:129
+#: plugins/personal/generic/generic.tpl:136
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/generic.tpl:145
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:148
+#: plugins/personal/generic/generic.tpl:155
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:157
 msgid "Edit certificates"
 msgstr "Modification des certificats"
 
-#: plugins/personal/generic/generic.tpl:154
+#: plugins/personal/generic/generic.tpl:161
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:162
 msgid "Edit properties"
 msgstr "Modifier les propriétés"
 
-#: plugins/personal/generic/generic.tpl:171
+#: plugins/personal/generic/generic.tpl:178
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:183 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:190 html/getxls.php:236
 msgid "Organization"
 msgstr "Entreprise"
 
-#: plugins/personal/generic/generic.tpl:187
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/addons/addressbook/address_edit.tpl:75
+#: plugins/personal/generic/generic.tpl:194
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/addons/addressbook/address_edit.tpl:138
+#: 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:589
-#: plugins/admin/ogroups/class_ogroupManagement.inc:417
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/admin/systems/class_systemManagement.inc:587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:416
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Département"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:198
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:197
+#: plugins/personal/generic/generic.tpl:204
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:203
+#: plugins/personal/generic/generic.tpl:210
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/generic.tpl:219
-#: plugins/personal/generic/generic.tpl:358
+#: plugins/personal/generic/generic.tpl:226
+#: plugins/personal/generic/generic.tpl:365
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:231
-#: plugins/addons/addressbook/address_edit.tpl:51
+#: plugins/personal/generic/generic.tpl:238
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+#: plugins/addons/addressbook/address_info.tpl:40
+#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/generic.tpl:257
+#: plugins/personal/generic/generic.tpl:264
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
 #: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
 #: html/getxls.php:236
 msgid "State"
 msgstr "Département"
 
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/generic.tpl:286
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/generic.tpl:283
+#: plugins/personal/generic/generic.tpl:290
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/generic.tpl:291
+#: plugins/personal/generic/generic.tpl:298
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/generic.tpl:299
+#: plugins/personal/generic/generic.tpl:306
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/generic.tpl:306
+#: plugins/personal/generic/generic.tpl:313
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/personal/generic/generic.tpl:318
+#: plugins/personal/generic/generic.tpl:325
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/generic.tpl:326
+#: plugins/personal/generic/generic.tpl:333
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/generic.tpl:333
+#: plugins/personal/generic/generic.tpl:340
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/generic.tpl:339
-#: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:346
+#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/generic.tpl:345
+#: plugins/personal/generic/generic.tpl:352
 msgid "House identifier"
 msgstr "Identifiant du batiment"
 
-#: plugins/personal/generic/generic.tpl:367
+#: plugins/personal/generic/generic.tpl:374
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
-#: plugins/personal/generic/generic.tpl:380
+#: plugins/personal/generic/generic.tpl:387
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/personal/generic/generic.tpl:394
 msgid "Public visible"
 msgstr "Visible par tous"
 
@@ -2564,60 +2623,56 @@ msgstr "invalide"
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:838
+#: plugins/personal/generic/class_user.inc:840
 msgid "Kerberos database communication failed"
 msgstr "La communication vers la base de données kerberos a échoué"
 
-#: plugins/personal/generic/class_user.inc:855
+#: plugins/personal/generic/class_user.inc:857
 msgid "Can't remove user from kerberos database."
 msgstr "Impossible de supprimer l'utilisateur de la base de données kerberos."
 
-#: plugins/personal/generic/class_user.inc:866
+#: plugins/personal/generic/class_user.inc:868
 msgid "Can't add user to kerberos database."
 msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "Invalid characters in uid."
-msgstr "L'uid contient des caractères invalides."
-
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:908
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
 
-#: plugins/personal/generic/class_user.inc:915
+#: plugins/personal/generic/class_user.inc:913
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation pour déplacer un utilisateur sur depuis cette "
 "'Base'."
 
-#: plugins/personal/generic/class_user.inc:921
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:546
+#: plugins/personal/generic/class_user.inc:919
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/personal/generic/class_user.inc:930
+#: plugins/personal/generic/class_user.inc:928
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Une personne ayant ce 'Identifiant' existe déjà dans l'annuaire."
 
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:534
-#: plugins/admin/users/class_userManagement.inc:549
+#: plugins/personal/generic/class_user.inc:934
+#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/admin/users/class_userManagement.inc:550
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
 
-#: plugins/personal/generic/class_user.inc:939
+#: plugins/personal/generic/class_user.inc:937
 msgid "The required field 'Login' is not set."
 msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
 
-#: plugins/personal/generic/class_user.inc:946
+#: plugins/personal/generic/class_user.inc:944
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr "Une personne ayant ce 'Nom'/'Nom Complet' existe déjà dans l'annuaire."
 
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:951
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2625,50 +2680,50 @@ msgstr ""
 "Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
 "chiffres et tirets sont autorisés."
 
-#: plugins/personal/generic/class_user.inc:956
+#: plugins/personal/generic/class_user.inc:954
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Le champ 'Page d'accueil' contient une URL invalide."
 
-#: plugins/personal/generic/class_user.inc:959
-#: plugins/personal/generic/class_user.inc:987
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:568
-#: plugins/admin/departments/class_departmentGeneric.inc:169
+#: plugins/personal/generic/class_user.inc:957
+#: plugins/personal/generic/class_user.inc:985
+#: 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 "Le champ 'Nom' contient des caractères invalides."
 
-#: plugins/personal/generic/class_user.inc:962
-#: plugins/personal/generic/class_user.inc:984
-#: plugins/addons/addressbook/class_addressbook.inc:543
-#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/personal/generic/class_user.inc:960
+#: plugins/personal/generic/class_user.inc:982
+#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/addons/addressbook/class_addressbook.inc:580
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Le champ 'Nom complet' contient des caractères invalides."
 
-#: plugins/personal/generic/class_user.inc:967
-#: plugins/personal/generic/class_user.inc:970
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:172
+#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:968
+#: 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 "Le champ 'Téléphone' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:554
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/personal/generic/class_user.inc:971
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/departments/class_departmentGeneric.inc:182
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Le champ 'Fax' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:976
-#: plugins/addons/addressbook/class_addressbook.inc:557
+#: plugins/personal/generic/class_user.inc:974
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Le champ 'GSM' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:979
-#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/personal/generic/class_user.inc:977
+#: plugins/addons/addressbook/class_addressbook.inc:575
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Le champ 'Bip' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:1106
+#: plugins/personal/generic/class_user.inc:1104
 msgid "Could not open specified certificate!"
 msgstr "Impossible d'ouvrir le certificat demandé!"
 
@@ -2680,15 +2735,15 @@ msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe!"
 msgid "Generic user information"
 msgstr "Information générales sur l'utilisateur"
 
-#: plugins/personal/connectivity/proxy.tpl:16
+#: plugins/personal/connectivity/proxy.tpl:10
 msgid "Proxy account"
 msgstr "Compte Proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:18
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr "Filtrer le contenu non désiré (i.e. pornographique ou violent)"
 
-#: plugins/personal/connectivity/proxy.tpl:35
+#: plugins/personal/connectivity/proxy.tpl:24
 msgid "Limit proxy access to working time"
 msgstr "Accès au proxy autorisé durant la plage horaire suivante"
 
@@ -2696,15 +2751,15 @@ msgstr "Accès au proxy autorisé durant la plage horaire suivante"
 msgid "Restrict proxy usage by quota"
 msgstr "Restreindre la quantité de données téléchargeables"
 
-#: plugins/personal/connectivity/proxy.tpl:80
+#: plugins/personal/connectivity/proxy.tpl:86
 msgid "per"
 msgstr "par"
 
-#: plugins/personal/connectivity/pptp.tpl:1
+#: plugins/personal/connectivity/pptp.tpl:3
 msgid "PPTP account"
 msgstr "Compte PPTP"
 
-#: plugins/personal/connectivity/intranet.tpl:1
+#: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Créer un compte Intranet"
 
@@ -2712,7 +2767,7 @@ msgstr "Créer un compte Intranet"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
+#: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Compte PHPGroupware"
 
@@ -2745,6 +2800,7 @@ msgid "Free Busy information"
 msgstr "Information de disponibilité"
 
 #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr "URL"
 
@@ -2762,49 +2818,57 @@ msgstr "jours"
 msgid "Invitation policy"
 msgstr "Politique d'invitation"
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
+#: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
 msgstr "Compte FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
+#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/admin/systems/glpi_devices.tpl:575
 msgid "Bandwidth"
 msgstr "Bande passante"
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
+#: plugins/personal/connectivity/pureftpd.tpl:19
 msgid "Upload bandwidth"
 msgstr "Bande passante montante"
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
 #: plugins/personal/connectivity/pureftpd.tpl:20
+#: plugins/personal/connectivity/pureftpd.tpl:24
 msgid "kb/s"
 msgstr "kb/sec"
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
+#: plugins/personal/connectivity/pureftpd.tpl:23
 msgid "Download bandwidth"
 msgstr "Bande passante descendante"
 
 #: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Quota"
+msgstr "Quota"
+
+#: plugins/personal/connectivity/pureftpd.tpl:39
 msgid "Files"
 msgstr "Fichier"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-#: plugins/addons/mailqueue/contents.tpl:33
+#: plugins/personal/connectivity/pureftpd.tpl:43
+#: 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 "Taille"
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
+#: plugins/personal/connectivity/pureftpd.tpl:54
 msgid "Ratio"
 msgstr "Ratio"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:58
 msgid "Uploaded / downloaded files"
 msgstr "Données envoyées / reçues"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Check to disable FTP Access"
 msgstr "Cliquez ici pour désactivez l'accès FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Temporary disable FTP access"
 msgstr "Désactiver temporairement l'accès FTP"
 
@@ -2849,36 +2913,36 @@ msgstr "Zone Horaire de l'utilisateur"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/connectivity/class_proxyAccount.inc:79
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
-#: plugins/addons/mailqueue/class_mailqueue.inc:170
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:299
 msgid "hour"
 msgstr "heure"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "day"
 msgstr "jour"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "week"
 msgstr "semaine"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:82
+#: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgid "month"
 msgstr "mois"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:133
+#: plugins/personal/connectivity/class_proxyAccount.inc:169
 msgid "Numerical value for Quota Setting is empty."
 msgstr "La valeur pour le quota est vide."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:136
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "La valeur dans le champ 'Paramètres du quota' n'est pas valide."
 
@@ -2894,7 +2958,7 @@ msgstr "Intranet"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/phpscheduleit.tpl:1
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr "Compte PHPscheduleit"
 
@@ -2969,34 +3033,30 @@ msgstr ""
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:135
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 "La valeur spécifiée dans le champ 'Bande passante en montée' n'est pas "
 "valide."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 "La valeur spécifiée dans le champ 'Bande passante en descente' n'est pas "
 "valide."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
 msgid "Value specified as 'Files' is not valid."
 msgstr "La valeur spécifiée dans le champ 'Fichier' n'est pas valide."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
 msgid "Value specified as 'Size' is not valid."
 msgstr "La valeur spécifiée dans le champ 'Taille' est invalide."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "La valeur spécifiée dans le champ 'Ratio' n'est pas valide."
 
-#: plugins/personal/connectivity/class_glpiAccount.inc:25
-msgid "GLPI"
-msgstr "Compte GLPI"
-
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
@@ -3043,7 +3103,7 @@ msgstr ""
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "Le module PHP4 pour postgresql est manquant!"
 
-#: plugins/personal/connectivity/webdav.tpl:1
+#: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "Compte WebDAV"
 
@@ -3055,6 +3115,55 @@ msgstr "Compte PHPscheduleit"
 msgid "This account has no connectivity extensions."
 msgstr "Ce compte n'as pas d'extension de connectivité."
 
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "Compte PHPGroupware"
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Emplacement de l'équipe"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Modèle d'utilisateur"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "Locked"
+msgstr "Verrouillé"
+
+#: plugins/personal/connectivity/opengw.tpl:64
+msgid "Teams"
+msgstr "Equipes"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
+msgid "Opengroupware account"
+msgstr "Compte Opengroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
+msgid ""
+"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
+"perform any database queries."
+msgstr ""
+"OpenGroupware: Votre configuration ne possède pas d'extension postgresql. "
+"Impossible d'effectuer des recherches."
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:144
+msgid ""
+"OpenGroupware: Missing database configuration for opengroupware. Can't get "
+"or set any informations."
+msgstr ""
+"OpenGroupware: La configuration de la base de données est inexistante. "
+"Impossible de lire ou d'écrire des informations."
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:152
+msgid ""
+"OpenGroupware: Can't connect to specified database. Please check given "
+"configuration twice."
+msgstr ""
+"OpenGorupware: Impossible de se connecter à la base de données spécifiée. "
+"Veuillez vérifier la configuration."
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Liste Rouge des Fax"
@@ -3064,226 +3173,227 @@ msgstr "Liste Rouge des Fax"
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Vous êtes sur le point de supprimer la liste rouge '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:220
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:218
 msgid "You have no permission to remove this blocklist."
 msgstr "Vous n'avez pas l'autorisation de supprimer cette liste rouge."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:236
 msgid "Please specify a valid phone number."
 msgstr "Veuillez entrer un numéro de téléphone valide."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: 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:280
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: 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
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
-#: plugins/admin/fai/class_faiManagement.inc:426
-#: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: 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:280
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: 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:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 msgid "Up"
 msgstr "Au dessus"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: 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:281
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/admin/departments/class_departmentManagement.inc:278
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: 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
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#: plugins/admin/fai/class_faiManagement.inc:429
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: 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:281
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/ogroups/class_ogroupManagement.inc:361
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/admin/departments/class_departmentManagement.inc:278
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: 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
 msgid "Root"
 msgstr "Racine"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: 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:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/systems/class_systemManagement.inc:568
+#: 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
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/groups/class_groupManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: 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:282
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/departments/class_departmentManagement.inc:279
+#: plugins/admin/systems/class_systemManagement.inc:568
+#: 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
 msgid "Home"
 msgstr "Acceuil"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "Create new blocklist"
 msgstr "Création d'un nouvelle liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "New Blocklist"
 msgstr "Nouvelle liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:299
-#: plugins/admin/fai/class_faiManagement.inc:461
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:676
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:286
-#: plugins/admin/systems/class_systemManagement.inc:576
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:333
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-msgid "Current base"
-msgstr "Base actuelle"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: 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:287
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:578
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit department"
 msgstr "Soumettre le département"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/fai/class_faiManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: 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:287
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:578
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Submit"
 msgstr "Soumettre"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/fai/class_faiManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: 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:294
-#: plugins/admin/systems/class_systemManagement.inc:582
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: 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/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
 msgid "edit"
 msgstr "éditer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
-#: plugins/admin/users/class_userManagement.inc:680
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:481
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: 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:295
-#: plugins/admin/systems/class_systemManagement.inc:583
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/systems/class_systemManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "delete"
 msgstr "supprimer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
-#: plugins/admin/users/class_userManagement.inc:682
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 msgid "Blocklist name"
 msgstr "Nom de la liste rouge"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:477
-#: plugins/admin/groups/class_groupManagement.inc:388
-#: plugins/admin/users/class_userManagement.inc:691
+#: 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:302
-#: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/ogroups/class_ogroupManagement.inc:394
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:318
+#: 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
 msgid "Actions"
 msgstr "Actions"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
 msgid "This table displays faxblocklists for the selected tree."
 msgstr "Ce tableau montre toutes les listes rouges, dans l'arbre sélectionné."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
 msgid "send"
 msgstr "envoyer"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
 msgid "receive"
 msgstr "recevoir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:522
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
-#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
+#: plugins/admin/departments/class_departmentGeneric.inc:164
 msgid "Required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:537
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Le champ obligatoire 'Nom' contient des caractères invalides"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:538
 msgid "Specified name is already used."
 msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
@@ -3304,9 +3414,13 @@ msgstr "Sélectionnez la branche où sera situé la liste rouge"
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:31
+#: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: 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 "Type"
@@ -3330,17 +3444,19 @@ msgstr "Les nombres peuvent aussi contenir des jokers."
 
 #: 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
-#: 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 "Avertissement"
 
 #: 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."
@@ -3350,7 +3466,8 @@ msgstr ""
 "récupérer vos données."
 
 #: 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."
@@ -3503,8 +3620,8 @@ msgid "FAX settings"
 msgstr "Configuration du FAX"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:99
 #: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:206
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3543,8 +3660,8 @@ msgstr "Vous essayez d'ajouter un numéro de téléphone invalide."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
-#: plugins/admin/groups/class_groupApplication.inc:375
-#: plugins/admin/groups/class_groupApplication.inc:426
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/groups/class_groupApplication.inc:514
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
 msgid "back"
 msgstr "retour"
@@ -3574,154 +3691,171 @@ msgstr ""
 "La réception d'un fax sur une imprimante ne fonctionnera que si une "
 "imprimante valable est mentionnée. Veuillez corriger votre choix."
 
-#: plugins/gofax/reports/detail.tpl:6
+#: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr "prévisualisation du FAX - Veuillez attendre"
 
-#: plugins/gofax/reports/detail.tpl:9
+#: plugins/gofax/faxreports/detail.tpl:8
 msgid "Click on fax to download"
 msgstr "Cliquez sur le fax pour le télécharger"
 
-#: plugins/gofax/reports/detail.tpl:18
+#: plugins/gofax/faxreports/detail.tpl:17
 msgid "FAX ID"
 msgstr "FAX ID"
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:21
+#: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/admin/systems/class_printGeneric.inc:649
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
 msgid "User"
 msgstr "Utilisateur"
 
-#: plugins/gofax/reports/detail.tpl:26
+#: plugins/gofax/faxreports/detail.tpl:25
 msgid "Date / Time"
 msgstr "Date / Heure"
 
-#: plugins/gofax/reports/detail.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:29
 msgid "Sender MSN"
 msgstr "MSN de l'expéditeur"
 
-#: plugins/gofax/reports/detail.tpl:34
+#: plugins/gofax/faxreports/detail.tpl:33
 msgid "Sender ID"
 msgstr "ID de l'expéditeur"
 
-#: plugins/gofax/reports/detail.tpl:38
+#: plugins/gofax/faxreports/detail.tpl:37
 msgid "Receiver MSN"
 msgstr "MSN du correspondant"
 
-#: plugins/gofax/reports/detail.tpl:42
+#: plugins/gofax/faxreports/detail.tpl:41
 msgid "Receiver ID"
 msgstr "ID du correspondant"
 
-#: plugins/gofax/reports/detail.tpl:50
+#: plugins/gofax/faxreports/detail.tpl:49
 msgid "Status message"
 msgstr "Statut"
 
-#: plugins/gofax/reports/detail.tpl:54
+#: plugins/gofax/faxreports/detail.tpl:53
 msgid "Transfer time"
 msgstr "Temps de transfert"
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+#: plugins/gofax/faxreports/detail.tpl:57
+#: plugins/gofax/faxreports/contents.tpl:35
 msgid "# pages"
 msgstr "# pages"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
+#: plugins/gofax/faxreports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Rapports des Fax"
 
-#: plugins/gofax/reports/class_faxreport.inc:100
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-"Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
-
-#: plugins/gofax/reports/class_faxreport.inc:106
-#: plugins/gofax/reports/class_faxreport.inc:218
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "Impossible de se connecter à la base de données des fax, aucun rapport ne "
 "peut être affiché!"
 
-#: plugins/gofax/reports/class_faxreport.inc:110
-#: plugins/gofax/reports/class_faxreport.inc:222
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+"Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
 msgid "Can't select fax database for report generation!"
 msgstr ""
 "Impossible de sélectionner la base de données fax pour la génération de "
 "rapports!"
 
-#: plugins/gofax/reports/class_faxreport.inc:118
-#: plugins/gofax/reports/class_faxreport.inc:230
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "La requête sur la base de données des fax a échoué!"
 
-#: plugins/gofax/reports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:185
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 "Vous n'avez pas l'autorisation de récupérer les informations à propos de "
 "l'identifiant de ce fax!"
 
-#: plugins/gofax/reports/class_faxreport.inc:146
-#: plugins/gofax/reports/class_faxreport.inc:238
-#: plugins/gofon/reports/class_fonreport.inc:170
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
 msgid "Y-M-D"
 msgstr "A-M-J"
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
+#: plugins/gofax/faxreports/contents.tpl:2
+#: plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/fonreports/contents.tpl:2
 msgid "Filter"
 msgstr "Filtre"
 
-#: plugins/gofax/reports/contents.tpl:6
+#: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:8
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Recherche de"
 
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+#: plugins/gofax/faxreports/contents.tpl:7
+#: plugins/gofon/fonreports/contents.tpl:7
 msgid "Enter user name to search for"
 msgstr "Entrez le nom recherché"
 
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+#: plugins/gofax/faxreports/contents.tpl:8
+#: plugins/gofax/faxreports/contents.tpl:16
+#: plugins/gofon/fonreports/contents.tpl:8
+#: plugins/gofon/fonreports/contents.tpl:16
 msgid "in"
 msgstr "dans"
 
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+#: plugins/gofax/faxreports/contents.tpl:9
+#: plugins/gofon/fonreports/contents.tpl:9
 msgid "Select subtree to base search on"
 msgstr "Sélectionnez la branche de l'annuaire où sera effectuée la recherche"
 
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+#: plugins/gofax/faxreports/contents.tpl:12
+#: plugins/gofon/fonreports/contents.tpl:12
 msgid "during"
 msgstr "pendant"
 
-#: plugins/gofax/reports/contents.tpl:21
+#: plugins/gofax/faxreports/contents.tpl:21
+#: plugins/addons/mailqueue/contents.tpl:10
+#: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Recherche"
 
-#: plugins/gofax/reports/contents.tpl:31
+#: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
+#: plugins/gofon/fonreports/contents.tpl:30
 msgid "Date"
 msgstr "Date"
 
-#: plugins/gofax/reports/contents.tpl:33
-#: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/gofax/faxreports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:56
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: plugins/gofax/reports/contents.tpl:34
+#: plugins/gofax/faxreports/contents.tpl:34
 msgid "Receiver"
 msgstr "Correspondant"
 
-#: plugins/gofax/reports/contents.tpl:47
+#: plugins/gofax/faxreports/contents.tpl:50
 #: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
+#: plugins/gofon/fonreports/contents.tpl:51
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
-#: plugins/gofax/reports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:5
 msgid "FAX reports"
 msgstr "Rapports des Fax"
 
@@ -3730,60 +3864,51 @@ msgid "Dial connection..."
 msgstr "Appel en cours ..."
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:362
-#: plugins/addons/addressbook/class_addressbook.inc:369
-#: plugins/addons/addressbook/class_addressbook.inc:373
-#: plugins/addons/addressbook/class_addressbook.inc:457
+#: 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:453
 msgid "Dial"
 msgstr "Appeler"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Choisissez le département où l'entrée sera stockée"
-
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personnel"
-
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Initiales"
+#: plugins/addons/addressbook/contents.tpl:14
+#: 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
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/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/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 "Nom"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:66
 msgid "Private"
 msgstr "Privé"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Adresse de messagerie"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Organisation"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Société"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Ville"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Pays"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Contact"
@@ -3804,6 +3929,7 @@ msgid "Add entry"
 msgstr "Ajouter une entrée"
 
 #: plugins/addons/addressbook/contents.tpl:50
+#: plugins/admin/groups/class_groupApplication.inc:596
 msgid "Edit entry"
 msgstr "Modifier une entrée"
 
@@ -3863,12 +3989,12 @@ msgstr "Carnet d'adresses"
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: plugins/addons/addressbook/class_addressbook.inc:152
+#: plugins/addons/addressbook/class_addressbook.inc:153
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Appeler de %s vers %s maintenant ?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:156
+#: plugins/addons/addressbook/class_addressbook.inc:157
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -3876,88 +4002,136 @@ msgstr ""
 "Vous n'avez pas de numéro de téléphone personnel indiqué. Veuillez rectifier "
 "cela en vue de pouvoir faire des appels directs."
 
-#: plugins/addons/addressbook/class_addressbook.inc:185
-#: plugins/addons/addressbook/class_addressbook.inc:289
+#: plugins/addons/addressbook/class_addressbook.inc:186
+#: plugins/addons/addressbook/class_addressbook.inc:287
 msgid "You are not allowed to delete this entry!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:283
+#: plugins/addons/addressbook/class_addressbook.inc:281
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Vous êtes sur le point de supprimer l'entrée %s."
 
-#: plugins/addons/addressbook/class_addressbook.inc:379
+#: plugins/addons/addressbook/class_addressbook.inc:377
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Enregistrer le contact %s au format vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:383
+#: plugins/addons/addressbook/class_addressbook.inc:381
 #, php-format
 msgid "Send mail to %s"
 msgstr "Envoyer un message à %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr "Carnet d'adresses général"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "user database"
 msgstr "Base de données des utilisateurs"
 
-#: plugins/addons/addressbook/class_addressbook.inc:476
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contact enregistré dans '%s'"
 
-#: plugins/addons/addressbook/class_addressbook.inc:478
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr "Création d'une nouvelle entrée dans"
 
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/addons/mailqueue/class_mailqueue.inc:153
-#: plugins/addons/logview/class_logview.inc:67
-#: plugins/addons/logview/class_logview.inc:81
+#: 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
+#: plugins/addons/logview/class_logview.inc:111
 msgid "All"
 msgstr "Tout"
 
-#: plugins/addons/addressbook/class_addressbook.inc:508
+#: 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 "Prénom"
+
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr "Téléphone du bureau"
 
-#: plugins/addons/addressbook/class_addressbook.inc:508
+#: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Cell phone"
 msgstr "GSM"
 
-#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:174
 msgid "Home phone"
 msgstr "Téléphone personnel"
 
-#: plugins/addons/addressbook/class_addressbook.inc:509 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 "ID de l'utilisateur"
 
-#: plugins/addons/addressbook/class_addressbook.inc:581
+#: plugins/addons/addressbook/class_addressbook.inc:596
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Impossible de créer un DN unique pour cette entrée. Veuillez remplir plus de "
 "champs."
 
-#: plugins/addons/addressbook/class_addressbook.inc:593
+#: plugins/addons/addressbook/class_addressbook.inc:604
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer ou modifier une entrée "
 "dans le carnet d'adresse général."
 
+#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_edit.tpl:24
+msgid "Personal"
+msgstr "Personnel"
+
+#: plugins/addons/addressbook/address_info.tpl:19
+#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Initiales"
+
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:45
+msgid "Email"
+msgstr "Adresse de messagerie"
+
+#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:119
+msgid "Organizational"
+msgstr "Organisation"
+
+#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:128
+msgid "Company"
+msgstr "Société"
+
+#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Ville"
+
+#: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:168
+msgid "Country"
+msgstr "Pays"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Choisissez le département où l'entrée sera stockée"
+
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 #: plugins/addons/mailqueue/main.inc:23
 msgid "Mail queue"
 msgstr "Queue du serveur de messagerie"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:46
+#: plugins/addons/mailqueue/class_mailqueue.inc:53
 msgid ""
 "Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
 "specified."
@@ -3965,62 +4139,155 @@ msgstr ""
 "Veuillez vérifier votre fichier 'gosa.conf' il n'y a pas de "
 "'MAILQUEUE_QUERY_COMMAND' spécifiée."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:68
-#: plugins/addons/mailqueue/class_mailqueue.inc:87
+#: plugins/addons/mailqueue/class_mailqueue.inc:80
+#: plugins/addons/mailqueue/class_mailqueue.inc:88
+#: plugins/addons/mailqueue/class_mailqueue.inc:107
+#: plugins/addons/mailqueue/class_mailqueue.inc:116
+#: plugins/addons/mailqueue/class_mailqueue.inc:171
+#: plugins/addons/mailqueue/class_mailqueue.inc:198
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 "Veuillez vérifier votre fichier 'gosa.conf' la commande %s ne peut pas être "
 "exécutée."
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:127
+#: plugins/addons/mailqueue/class_mailqueue.inc:251
 msgid "up"
 msgstr "au dessus"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:129
+#: plugins/addons/mailqueue/class_mailqueue.inc:253
 msgid "down"
 msgstr "En bas"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:167
+#: plugins/addons/mailqueue/class_mailqueue.inc:296
 msgid "no limit"
 msgstr "pas de limites"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:172
+#: plugins/addons/mailqueue/class_mailqueue.inc:301
 msgid "hours"
 msgstr "heures"
 
-#: plugins/addons/mailqueue/contents.tpl:9
+#: plugins/addons/mailqueue/class_mailqueue.inc:347
+msgid "Hold"
+msgstr "Maintenir"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:348
+msgid "Un hold"
+msgstr "Mettre en attente"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:349
+#: plugins/addons/mailqueue/contents.tpl:76
+msgid "Active"
+msgstr "Actif"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:350
+msgid "Not active"
+msgstr "Pas actif"
+
+#: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr "Veuillez indiquer une chaîne de caractères a chercher."
 
-#: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:14
 msgid "Select a server"
 msgstr "Sélectionnez un serveurs"
 
-#: plugins/addons/mailqueue/contents.tpl:14
+#: plugins/addons/mailqueue/contents.tpl:17
+msgid "with status"
+msgstr "avec les statuts"
+
+#: plugins/addons/mailqueue/contents.tpl:21
 msgid "within the last"
 msgstr "pendant la dernière"
 
-#: plugins/addons/mailqueue/contents.tpl:25
+#: plugins/addons/mailqueue/contents.tpl:29
+msgid "Remove all messages"
+msgstr "Enlever tout les messages"
+
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Remove all messages from selected servers queue"
+msgstr "Enlever tout les messages des queues sélectionnées"
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Hold all messages"
+msgstr "Mettre en attente tout les messages"
+
+#: plugins/addons/mailqueue/contents.tpl:32
+msgid "Hold all messages in selected servers queue"
+msgstr "Mettre en attente tout les messages dans les queues sélectionnées"
+
+#: plugins/addons/mailqueue/contents.tpl:33
+msgid "Release all messages"
+msgstr "Libérer tout les messages"
+
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Release all messages in selected servers queue"
+msgstr "Libérer tout les messages dans les queues sélectionnées"
+
+#: plugins/addons/mailqueue/contents.tpl:35
+msgid "Requeue all messages"
+msgstr "Remettre tout les messages dans la queue"
+
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Requeue all messages in selected servers queue"
+msgstr "Remettre tout les messages dans les queues sélectionnées"
+
+#: plugins/addons/mailqueue/contents.tpl:46
 msgid "Search returned no results"
 msgstr "La recherche n'a renvoyé aucun résultat"
 
-#: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/contents.tpl:52
 msgid "ID"
 msgstr "ID"
 
-#: plugins/addons/mailqueue/contents.tpl:34
+#: plugins/addons/mailqueue/contents.tpl:55
 msgid "Arrival"
 msgstr "Arrivée"
 
-#: plugins/addons/mailqueue/contents.tpl:36
+#: plugins/addons/mailqueue/contents.tpl:57
 msgid "Recipient"
 msgstr "Destinataire"
 
-#: plugins/addons/mailqueue/contents.tpl:37
+#: plugins/addons/mailqueue/contents.tpl:58
 msgid "Error"
 msgstr "Erreur"
 
+#: plugins/addons/mailqueue/contents.tpl:93
+msgid "Delete this message"
+msgstr "Supprimer ce message"
+
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "unhold"
+msgstr "enlever de la file d'attente"
+
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "Release message"
+msgstr "Enlever le message de la file d'attente"
+
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "hold"
+msgstr "mettre dans la file d'attente"
+
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "Hold message"
+msgstr "Mettre en attente"
+
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "requeue"
+msgstr "remettre dans la queue"
+
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "Requeue this message"
+msgstr "Remettre ce message dans la queue"
+
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "header"
+msgstr "entête"
+
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "Display header from this message"
+msgstr "Afficher l'entête de ce message"
+
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
 msgid ""
 "The XLS export plugin provides methods to download a complete snapshot of "
@@ -4076,52 +4343,52 @@ msgstr ""
 msgid "LDIF export"
 msgstr "Exportation LDIF"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:96
+#: plugins/addons/ldapmanager/class_csvimport.inc:101
 msgid "You've no permission to do CSV imports."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour effectuer des importations CSV."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:157
+#: plugins/addons/ldapmanager/class_csvimport.inc:161
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "J'ai besoin d'un 'sn','givenName' et 'uid' pour créer un utilisateur."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:203
+#: plugins/addons/ldapmanager/class_csvimport.inc:209
 msgid "failed"
 msgstr "échec"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:207
+#: plugins/addons/ldapmanager/class_csvimport.inc:213
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:264
+#: plugins/addons/ldapmanager/class_csvimport.inc:277
 msgid "status"
 msgstr "statut"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:268
+#: plugins/addons/ldapmanager/class_csvimport.inc:281
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Une erreur s'est produite lors de l'insertion de l'entrée %s -  le processus "
 "à été interrompu"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:293
+#: plugins/addons/ldapmanager/class_csvimport.inc:319
 msgid "Nothing to import!"
 msgstr "Rien à importer !"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:305
-#: plugins/addons/ldapmanager/class_csvimport.inc:316
-#: plugins/addons/ldapmanager/class_csvimport.inc:321
+#: plugins/addons/ldapmanager/class_csvimport.inc:331
+#: plugins/addons/ldapmanager/class_csvimport.inc:342
+#: plugins/addons/ldapmanager/class_csvimport.inc:347
 #: plugins/addons/ldapmanager/class_import.inc:62
 #: plugins/addons/ldapmanager/class_import.inc:70
 msgid "There is no file uploaded."
 msgstr "Pas de fichier téléchargé."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
+#: plugins/addons/ldapmanager/class_csvimport.inc:336
 #: plugins/addons/ldapmanager/class_import.inc:55
 msgid "The specified file is empty."
 msgstr "Le fichier spécifié est vide."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:449
+#: plugins/addons/ldapmanager/class_csvimport.inc:490
 msgid "The selected file does not contain any CSV Data..."
 msgstr "Le fichier spécifié ne contient pas de données CSV valide..."
 
@@ -4184,9 +4451,9 @@ msgstr "Oups. Il à eu une erreur lors de l'importation de vos données."
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:39
 msgid "Here is the status report for the import:"
-msgstr "Voici le rapport de l'état de votre importation:"
+msgstr "Voici le rapport de votre importation:"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
+#: plugins/addons/ldapmanager/contentcsv.tpl:80
 msgid "Selected Template"
 msgstr "Sélectionnez le modèle"
 
@@ -4194,13 +4461,13 @@ msgstr "Sélectionnez le modèle"
 msgid "XLS import"
 msgstr "Importer un fichier XLS"
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:39
 #: plugins/addons/ldapmanager/class_export.inc:38
 msgid "You've no permission to do LDAP exports."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour effectuer des exportations LDAP."
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:88
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
 #: plugins/addons/ldapmanager/class_export.inc:83
 msgid "Error while exporting the requested entries!"
 msgstr "Une erreur s'est produite lors de l'exportation!"
@@ -4240,9 +4507,9 @@ msgstr "Cliquez ici pour exporter l'arbre LDAP "
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 #: plugins/addons/ldapmanager/main.inc:23
 msgid "LDAP manager"
-msgstr "Manager LDAP"
+msgstr "Gérer LDAP"
 
-#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "Importer un fichier CSV"
 
@@ -4250,69 +4517,61 @@ msgstr "Importer un fichier CSV"
 msgid "System logs"
 msgstr "Logs systèmes"
 
-#: plugins/addons/logview/class_logview.inc:36
+#: plugins/addons/logview/class_logview.inc:63
 msgid "No LOG servers defined!"
 msgstr "Pas de LOG serveurs définis!"
 
-#: plugins/addons/logview/class_logview.inc:52
-#: plugins/addons/logview/class_logview.inc:152
+#: plugins/addons/logview/class_logview.inc:73
+#: plugins/addons/logview/class_logview.inc:168
+msgid "Can't connect to log database, no logs can be shown!"
+msgstr ""
+"Impossible de se connecter à la base de données des logs, aucun log ne peut "
+"être affiché!"
+
+#: plugins/addons/logview/class_logview.inc:77
+#: plugins/addons/logview/class_logview.inc:171
 msgid "Can't select log database for log generation!"
 msgstr ""
 "Impossible de sélectionner la base de données des logs afin de générer les "
 "logs!"
 
-#: plugins/addons/logview/class_logview.inc:61
-#: plugins/addons/logview/class_logview.inc:75
-#: plugins/addons/logview/class_logview.inc:224
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:103
 msgid "Query for log database failed!"
 msgstr "La requête sur la base de données des logs a échoué!"
 
-#: plugins/addons/logview/class_logview.inc:85
+#: plugins/addons/logview/class_logview.inc:118
 msgid "one hour"
 msgstr "Une heure"
 
-#: plugins/addons/logview/class_logview.inc:85
+#: plugins/addons/logview/class_logview.inc:118
 msgid "6 hours"
 msgstr "6 heures"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:119
 msgid "12 hours"
 msgstr "12 heures"
 
-#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:119
 msgid "24 hours"
 msgstr "24 heures"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:120
 msgid "2 days"
 msgstr "2 jours"
 
-#: plugins/addons/logview/class_logview.inc:87
+#: plugins/addons/logview/class_logview.inc:120
 msgid "one week"
 msgstr "une semaine"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:121
 msgid "2 weeks"
 msgstr "2 semaines"
 
-#: plugins/addons/logview/class_logview.inc:88
+#: plugins/addons/logview/class_logview.inc:121
 msgid "one month"
 msgstr "un mois"
 
-#: plugins/addons/logview/class_logview.inc:102
-msgid ""
-"There is no mysql extension available in your php setup, can't perform any "
-"query."
-msgstr ""
-"Il n'y a pas d'extension mysql disponible dans votre configuration php, "
-"impossible d'effectuer des requêtes."
-
-#: plugins/addons/logview/class_logview.inc:149
-msgid "Can't connect to log database, no logs can be shown!"
-msgstr ""
-"Impossible de se connecter à la base de données des logs, aucun log ne peut "
-"être affiché!"
-
 #: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
 msgstr "Afficher les machines"
@@ -4349,11 +4608,11 @@ msgstr "Message"
 msgid "System log view"
 msgstr "Affichage des logs système"
 
-#: 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 ""
 "Impossible de bouger l'arbre. L'arbre de destination est un sous arbre de "
@@ -4367,22 +4626,45 @@ msgstr "FAI"
 msgid "Fully Automatic Installation - management"
 msgstr "Gestion de - Fully Automatic Installation"
 
-#: plugins/admin/fai/class_faiManagement.inc:205
+#: plugins/admin/fai/class_faiManagement.inc:226
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives au "
 "composant FAI '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:211
-#: plugins/admin/fai/class_faiManagement.inc:250
+#: 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:477
+#: plugins/admin/systems/class_systemManagement.inc:478
 msgid "You are not allowed to delete this component!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
 
-#: plugins/admin/fai/class_faiManagement.inc:396
-#: plugins/admin/fai/faiPackageNew.tpl:65 plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:315
+#: plugins/admin/fai/class_faiManagement.inc:421
+#, fuzzy
+msgid "Specified branch name is invalid."
+msgstr "Le nom spécifié est invalide."
+
+#: 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 "Le nom spécifié est déjà utilisé."
+
+#: plugins/admin/fai/class_faiManagement.inc:375
+#, fuzzy, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr "Vous êtes sur le point de supprimer la macro '%s'."
+
+#: plugins/admin/fai/class_faiManagement.inc:378
+#, fuzzy
+msgid "You are not allowed to delete this release!"
+msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
+
+#: 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
@@ -4394,113 +4676,114 @@ msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
 msgid "Continue"
 msgstr "Continuer"
 
-#: plugins/admin/fai/class_faiManagement.inc:432
-#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:635
+#: plugins/admin/departments/class_departmentManagement.inc:279
 msgid "Go to users home department"
 msgstr "Aller au département de base des utilisateurs"
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:640
 msgid "New profile"
 msgstr "Nouveau profil"
 
-#: plugins/admin/fai/class_faiManagement.inc:437
+#: plugins/admin/fai/class_faiManagement.inc:640
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr "P"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:645
 msgid "New partition table"
 msgstr "Nouvelle table des partitions"
 
-#: plugins/admin/fai/class_faiManagement.inc:442
+#: plugins/admin/fai/class_faiManagement.inc:645
 msgid "PT"
 msgstr "PT"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:648
 msgid "New scripts"
 msgstr "Nouveau scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:648
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:651
 msgid "New hooks"
 msgstr "Nouvelles connexions"
 
-#: plugins/admin/fai/class_faiManagement.inc:448
+#: plugins/admin/fai/class_faiManagement.inc:651
 msgid "H"
 msgstr "H"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "New variables"
 msgstr "Nouvelles variables"
 
-#: plugins/admin/fai/class_faiManagement.inc:451
+#: plugins/admin/fai/class_faiManagement.inc:654
 msgid "V"
 msgstr "V"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:657
 msgid "New templates"
 msgstr "Nouveau modèles"
 
-#: plugins/admin/fai/class_faiManagement.inc:454
+#: plugins/admin/fai/class_faiManagement.inc:657
 msgid "T"
 msgstr "T"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "New package list"
 msgstr "Nouvelle liste des paquets"
 
-#: plugins/admin/fai/class_faiManagement.inc:457
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "PK"
 msgstr "PK"
 
-#: plugins/admin/fai/class_faiManagement.inc:471
-#: plugins/admin/systems/class_systemManagement.inc:592
+#: 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 "Ce tableau montre toutes les systèmes, dans l'arbre sélectionné."
 
-#: plugins/admin/fai/class_faiManagement.inc:475
+#: plugins/admin/fai/class_faiManagement.inc:678
 msgid "Name of FAI class"
 msgstr "Nom de la classe FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:476
+#: plugins/admin/fai/class_faiManagement.inc:679
 msgid "Class type"
 msgstr "Type de la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:480
+#: plugins/admin/fai/class_faiManagement.inc:683
 msgid "Edit class"
 msgstr "Editer la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:481
+#: plugins/admin/fai/class_faiManagement.inc:684
 msgid "Delete class"
 msgstr "Effacer la classe"
 
-#: plugins/admin/fai/class_faiManagement.inc:501
-#: plugins/admin/groups/class_groupApplication.inc:381
-#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/fai/class_faiManagement.inc:704
+#: plugins/admin/groups/class_groupApplication.inc:520
+#: plugins/admin/departments/class_departmentManagement.inc:315
 msgid "department"
 msgstr "département"
 
-#: plugins/admin/fai/class_faiManagement.inc:523
-#: plugins/admin/fai/class_faiManagement.inc:524
-#: plugins/admin/fai/class_faiProfile.inc:161
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: 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 "Table des partitions"
 
-#: plugins/admin/fai/class_faiManagement.inc:530
-#: plugins/admin/fai/class_faiManagement.inc:531
+#: plugins/admin/fai/class_faiManagement.inc:732
+#: plugins/admin/fai/class_faiManagement.inc:733
 msgid "Package list"
 msgstr "Liste des paquets"
 
-#: plugins/admin/fai/class_faiManagement.inc:537
-#: plugins/admin/fai/class_faiManagement.inc:538
+#: plugins/admin/fai/class_faiManagement.inc:739
+#: plugins/admin/fai/class_faiManagement.inc:740
 msgid "Scripts"
 msgstr "Scripts"
 
-#: plugins/admin/fai/class_faiManagement.inc:558
-#: plugins/admin/fai/class_faiManagement.inc:559
+#: plugins/admin/fai/class_faiManagement.inc:760
+#: plugins/admin/fai/class_faiManagement.inc:761
 msgid "Profile"
 msgstr "Profil"
 
@@ -4520,7 +4803,7 @@ msgstr "Installation entièrement automatique (FAI)"
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
 #: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
 #: plugins/admin/fai/faiHook.tpl:32
 msgid "Objects"
 msgstr "Objets"
@@ -4537,7 +4820,7 @@ msgstr "Choisissez un disque à effacer ou editer"
 msgid "List of FAI objects (Fully Automatic Installation)"
 msgstr "Liste des objets FAI (Fully Automatic Installation)"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:27
+#: plugins/admin/fai/faiProfileEntry.tpl:26
 msgid ""
 "This menu allows you to select FAI class names and to add them to the "
 "currently edited profile."
@@ -4545,63 +4828,69 @@ msgstr ""
 "Ce menu vous permet de sélectionner des classes FAI et de les ajouter au "
 "profile actuellement édité."
 
-#: plugins/admin/fai/faiProfileEntry.tpl:40
+#: plugins/admin/fai/faiProfileEntry.tpl:39
 msgid "Show only classes with templates"
 msgstr "Montrer seulement les classes avec modèles"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:42
+#: plugins/admin/fai/faiProfileEntry.tpl:41
 msgid "Show only classes with scripts"
 msgstr "Montrer seulement les classes avec scripts"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:44
+#: plugins/admin/fai/faiProfileEntry.tpl:43
 msgid "Show only classes with hooks"
 msgstr "Montrer seulement les classes avec une connection"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:46
+#: plugins/admin/fai/faiProfileEntry.tpl:45
 msgid "Show only classes with variables"
 msgstr "Montrer seulement les classes avec variables"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:48
+#: plugins/admin/fai/faiProfileEntry.tpl:47
 msgid "Show only classes with packages"
 msgstr "Montrer seulement les classes avec des paquets"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:50
+#: plugins/admin/fai/faiProfileEntry.tpl:49
 msgid "Show only classes with partitions"
 msgstr "Montrer seulement les classes avec des partitions"
 
+#: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiProfileEntry.tpl:56
-#: plugins/admin/fai/faiPackageEntry.tpl:50 plugins/admin/fai/headpage.tpl:47
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:30
+#: 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 "Afficher les objets correspondants"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:60
-#: plugins/admin/fai/faiPackageEntry.tpl:55 plugins/admin/fai/headpage.tpl:51
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:34
+#: plugins/admin/fai/faiProfileEntry.tpl:59
+#: 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 "Expression régulière pour trouver les objets correspondants"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquet"
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:62
+#: plugins/admin/fai/class_faiHookEntry.inc:64
 msgid "Please select a valid file."
 msgstr "Veuillez sélectionner un fichier valide."
 
-#: 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 "Le fichier spécifié est vide."
 
-#: 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:104
+#: plugins/admin/fai/class_faiHookEntry.inc:122
 #: plugins/admin/fai/class_faiTemplateEntry.inc:164
 msgid "Please enter a name."
 msgstr " Veuillez entrer un nom."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:103
+#: plugins/admin/fai/class_faiScriptEntry.inc:113
 msgid "Please enter a script."
 msgstr "Veuillez indiquer un script."
 
@@ -4614,12 +4903,12 @@ msgid "Choose a variable to delete or edit"
 msgstr "Choisissez une variable à effacer ou éditer"
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:690
+#: 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
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:393
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propriétés"
@@ -4638,114 +4927,95 @@ msgstr "Sélectionnez une priorité"
 msgid "Import script"
 msgstr "Importez un script"
 
-#: plugins/admin/fai/class_faiPackage.inc:123
-msgid "There is no useable package list defined."
-msgstr "Il n'y a pas de liste de paquets utilisable définie."
-
-#: plugins/admin/fai/class_faiPackage.inc:261
-#, php-format
-msgid "Can't read configuration folder '%s'."
-msgstr "Impossible de lire la configuration du répertoire '%s'."
-
-#: plugins/admin/fai/class_faiPackage.inc:343
+#: plugins/admin/fai/class_faiPackage.inc:291
 msgid "Please select a least one Package."
 msgstr "Veuillez sélectionner au moins un paquet."
 
-#: plugins/admin/fai/class_faiPackage.inc:347
+#: plugins/admin/fai/class_faiPackage.inc:295
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Veuillez choisir une combinaison valable pour la création de votre dépôt de "
 "paquets."
 
-#: plugins/admin/fai/class_faiPackage.inc:378
+#: plugins/admin/fai/class_faiPackage.inc:316
+msgid "package is configured"
+msgstr "le paquet est configuré"
+
+#: plugins/admin/fai/class_faiPackage.inc:340
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr "Le paquets '%s' n'existe pas."
 
-#: plugins/admin/fai/faiPackage.tpl:29
-msgid "Repository"
-msgstr "Dépôt"
-
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:29
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:196
 msgid "Release"
 msgstr "Version"
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:313
+#: plugins/admin/systems/class_printerPPDDialog.inc:319
 msgid "Section"
 msgstr "Section"
 
-#: plugins/admin/fai/faiPackage.tpl:50
-msgid "Mirror"
-msgstr "Mirroir"
-
-#: plugins/admin/fai/faiPackage.tpl:54 plugins/admin/fai/faiPackageNew.tpl:51
-msgid "mirror"
-msgstr "mirroir"
-
-#: plugins/admin/fai/faiPackage.tpl:57 plugins/admin/fai/faiPackageNew.tpl:59
-#: plugins/admin/systems/workstationStartup.tpl:41
-msgid "set"
-msgstr "activé"
-
-#: plugins/admin/fai/faiPackage.tpl:68
+#: plugins/admin/fai/faiPackage.tpl:55
 msgid "Used packages"
 msgstr "Paquets utilisés"
 
-#: plugins/admin/fai/faiPackage.tpl:70
+#: plugins/admin/fai/faiPackage.tpl:57
 msgid "Choosen packages"
 msgstr "Paquets Choisis"
 
-#: plugins/admin/fai/faiPackage.tpl:76 include/functions.inc:587
+#: plugins/admin/fai/faiPackage.tpl:63 include/functions.inc:595
 msgid "Configure"
 msgstr "Configurer"
 
-#: plugins/admin/fai/class_faiProfile.inc:145
-#: plugins/admin/fai/class_faiProfileEntry.inc:151
+#: 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 "Cette liste affiche toute les classes appartenant à ce profile."
 
-#: plugins/admin/fai/class_faiProfile.inc:153
-msgid "Append new class names"
-msgstr "Ajouter des nouveaux noms de classes"
-
-#: plugins/admin/fai/class_faiProfile.inc:156
-#: plugins/admin/fai/class_faiProfileEntry.inc:118
+#: plugins/admin/fai/class_faiProfile.inc:275
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Ensemble de connections"
 
-#: plugins/admin/fai/class_faiProfile.inc:157
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:276
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Ensemble de modèles"
 
-#: plugins/admin/fai/class_faiProfile.inc:158
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:277
+#: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Ensemble de scripts"
 
-#: plugins/admin/fai/class_faiProfile.inc:159
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:278
+#: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Ensemble de variables"
 
-#: plugins/admin/fai/class_faiProfile.inc:160
+#: plugins/admin/fai/class_faiProfile.inc:279
 msgid "Packages bundle"
 msgstr "Ensemble de paquets"
 
-#: plugins/admin/fai/class_faiProfile.inc:163
+#: plugins/admin/fai/class_faiProfile.inc:283
 msgid "Remove class from profile"
 msgstr "Enlever la classe du profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:226
+#: plugins/admin/fai/class_faiProfile.inc:287
+#: plugins/admin/ogroups/phonequeue.tpl:18
+msgid "Down"
+msgstr "En bas"
+
+#: plugins/admin/fai/class_faiProfile.inc:351
 msgid "Please assign at least one class to this  profile."
 msgstr "Veuillez assigner au moins une classe à ce profile."
 
-#: plugins/admin/fai/class_faiProfile.inc:230
+#: plugins/admin/fai/class_faiProfile.inc:355
 msgid "Please enter a valid name."
 msgstr "Veuillez entrer un nom valide."
 
-#: plugins/admin/fai/class_faiProfile.inc:238
+#: plugins/admin/fai/class_faiProfile.inc:363
 msgid "There is already a profile with this class name defined."
 msgstr "Il y a déjà un profil avec ce nom de classe."
 
@@ -4840,11 +5110,11 @@ msgstr "Liste des scripts"
 msgid "Choose a script to delete or edit"
 msgstr "Choisissez un script à effacer ou éditer"
 
-#: plugins/admin/fai/faiPackageNew.tpl:2
+#: plugins/admin/fai/faiPackageNew.tpl:1
 msgid "Repository settings"
 msgstr "Paramètres du dépôt"
 
-#: plugins/admin/fai/faiPackageNew.tpl:6
+#: plugins/admin/fai/faiPackageNew.tpl:3
 msgid ""
 "To add packages to your package list you have to setup the repository "
 "settings first."
@@ -4852,7 +5122,7 @@ msgstr ""
 "Pour ajouter des paquets à votre liste, vous devez d'abord configurer votre "
 "dépôt."
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
+#: plugins/admin/fai/faiPackageNew.tpl:5
 msgid ""
 "Packages are usually stored on different servers called mirrors. These "
 "mirrors have different types of releases (for example woody/sarge/etch), "
@@ -4862,7 +5132,7 @@ msgstr ""
 "miroirs. Ces miroirs hébergent différentes versions (par exemple woody/sarge/"
 "etc), qui contient les paquets triés par section."
 
-#: plugins/admin/fai/faiPackageNew.tpl:11
+#: plugins/admin/fai/faiPackageNew.tpl:8
 msgid ""
 "Section and release can't be changed in future dialogs, but the mirror can "
 "be changed by editing the entry."
@@ -4870,24 +5140,25 @@ msgstr ""
 "La section et la version ne peuvent pas être changé par après, mais les "
 "miroirs peuvent être changés."
 
-#: plugins/admin/fai/faiPackageNew.tpl:17
+#: plugins/admin/fai/faiPackageNew.tpl:14
 msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 "Choisissez en premier lieu votre version préférée, ensuite la section et "
 "finalement le miroir."
 
-#: plugins/admin/fai/faiPackageNew.tpl:25
+#: plugins/admin/fai/faiPackageNew.tpl:21
 msgid "Following releases are available"
 msgstr "Les versions suivantes sont disponibles"
 
-#: plugins/admin/fai/faiPackageNew.tpl:37
+#: plugins/admin/fai/faiPackageNew.tpl:31
 msgid "Sections for this release"
 msgstr "Sections pour cette version"
 
-#: plugins/admin/fai/faiPackageNew.tpl:48
-msgid "Matching mirrors"
-msgstr "miroirs correspondants"
+#: plugins/admin/fai/faiPackageNew.tpl:35
+#: plugins/admin/systems/workstationStartup.tpl:41
+msgid "set"
+msgstr "activé"
 
 #: plugins/admin/fai/class_faiVariableEntry.inc:82
 msgid "Please specify a value for the attribute 'content'."
@@ -4913,7 +5184,7 @@ msgstr "Choisissez le modèle à effacer où éditer"
 msgid "List of available packages"
 msgstr "Liste des paquets disponibles"
 
-#: plugins/admin/fai/faiPackageEntry.tpl:27
+#: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
 "This menu allows you to select multiple packages to add them to the "
 "currently edited package list."
@@ -4949,55 +5220,78 @@ msgstr "Liste des classes FAI"
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr "Ce menu vous permet créer, effacer et éditer des classes FAI."
 
-#: plugins/admin/fai/headpage.tpl:36
-msgid "Show profiles"
-msgstr "Afficher les profils"
+#: plugins/admin/fai/headpage.tpl:29
+#, fuzzy
+msgid "Branches"
+msgstr "Annuler"
 
-#: plugins/admin/fai/headpage.tpl:37 plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Afficher les modèles"
+#: plugins/admin/fai/headpage.tpl:35
+#, fuzzy
+msgid "Current release"
+msgstr "Base actuelle"
 
-#: plugins/admin/fai/headpage.tpl:38
-msgid "Show scripts"
-msgstr "Afficher les scripts"
+#: plugins/admin/fai/headpage.tpl:47
+msgid "Create new branch using the current release"
+msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:39
+#: plugins/admin/fai/headpage.tpl:51
+msgid "Create a locked version of the current release"
+msgstr ""
+
+#: plugins/admin/fai/headpage.tpl:56
+#, fuzzy
+msgid "Delete current release"
+msgstr "Effacer la classe"
+
+#: plugins/admin/fai/headpage.tpl:71
+msgid "Show profiles"
+msgstr "Afficher les profils"
+
+#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Afficher les modèles"
+
+#: plugins/admin/fai/headpage.tpl:73
+msgid "Show scripts"
+msgstr "Afficher les scripts"
+
+#: plugins/admin/fai/headpage.tpl:74
 msgid "Show hooks"
 msgstr "Montrer les connections"
 
-#: plugins/admin/fai/headpage.tpl:40
+#: plugins/admin/fai/headpage.tpl:75
 msgid "Show variables"
 msgstr "Afficher les variables"
 
-#: plugins/admin/fai/headpage.tpl:41
+#: plugins/admin/fai/headpage.tpl:76
 msgid "Show packages"
 msgstr "Afficher les paquets"
 
-#: plugins/admin/fai/headpage.tpl:42
+#: plugins/admin/fai/headpage.tpl:77
 msgid "Show partitions"
 msgstr "Afficher les partitions"
 
-#: 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 "partition(s) %s "
 
-#: 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 "partition(s) %s "
 
-#: plugins/admin/fai/class_faiHookEntry.inc:100
+#: plugins/admin/fai/class_faiHookEntry.inc:118
 msgid "Please enter a value for script."
 msgstr "Veuillez entrer une valeur pour le script."
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfileEntry.inc:123
 msgid "Package bundle"
 msgstr "Ensemble des paquets"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:153
+#: plugins/admin/fai/class_faiProfileEntry.inc:154
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Nom de la classe"
@@ -5014,43 +5308,48 @@ msgstr "Tâche"
 msgid "Choose an existing FAI task"
 msgstr "Choisissez une tâche FAI existante"
 
-#: plugins/admin/fai/class_askClassName.inc:71
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr "Information Debconf pour le paquet '%s'"
+
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - partition table."
 msgstr "Créer un nouvel objet FAI - table des partitions."
 
-#: plugins/admin/fai/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object - package bundle."
 msgstr "Créer un nouvel objet FAI - liste de paquets."
 
-#: plugins/admin/fai/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:79
 msgid "Create new FAI object - script bundle."
-msgstr "Créer un nouvel objet FAI - liste des scripts."
+msgstr "Créer un nouvel objet FAI - ensemble de scripts."
 
-#: plugins/admin/fai/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:80
 msgid "Create new FAI object - variable bundle."
-msgstr "uCréer un nouvel objet FAI - ensemble de variables."
+msgstr "Créer un nouvel objet FAI - ensemble de variables."
 
-#: plugins/admin/fai/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - hook bundle."
-msgstr "Créer un nouvel objet FAI - ensemble des connections ."
+msgstr "Créer un nouvel objet FAI - ensemble des connections."
 
-#: plugins/admin/fai/class_askClassName.inc:76
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - profile."
 msgstr "Créer un nouvel objet FAI - profil."
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object - template."
 msgstr "Créer un nouvel objet FAI - modèle."
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:84
 msgid "Create new FAI object"
 msgstr "Créer un nouvel objet FAI"
 
-#: plugins/admin/fai/class_askClassName.inc:131
+#: plugins/admin/fai/class_askClassName.inc:137
 msgid "The given class name is empty."
-msgstr "Le nom de classe indique est vide."
+msgstr "Le nom de classe indiqué est vide."
 
-#: 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 "Le nom de classe indiqué est déjà utilisé pour un objet de ce type."
 
@@ -5089,6 +5388,12 @@ msgid "Choose class name"
 msgstr "Choisissez un nom de classe"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: 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 "Utiliser"
 
@@ -5137,7 +5442,8 @@ msgstr ""
 msgid "Template attributes"
 msgstr "Attributs des modèles"
 
-#: 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 "Fichier"
 
@@ -5146,8 +5452,9 @@ msgid "Save template"
 msgstr "Sauver le modèle"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:92
+#: plugins/admin/applications/generic.tpl:95
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
 msgstr "Télécharger"
 
@@ -5156,15 +5463,15 @@ msgid "Destination path"
 msgstr "Répertoire de destination"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:316
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
 msgid "Owner"
 msgstr "Propriétaire"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:582
-#: plugins/admin/systems/class_printGeneric.inc:584
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: 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"
 msgstr "Groupes"
@@ -5174,6 +5481,7 @@ msgid "Access"
 msgstr "Accès"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/systems/class_servDNS.inc:266
 msgid "Class"
 msgstr "Classe"
 
@@ -5211,7 +5519,7 @@ msgstr "Autres"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:118
 msgid "sticky"
-msgstr "Permanent"
+msgstr "permanent"
 
 #: plugins/admin/fai/faiHook.tpl:34
 msgid "List of hook scripts"
@@ -5221,6 +5529,33 @@ msgstr "Liste des scripts de connexions"
 msgid "Choose a hook to delete or edit"
 msgstr "Choisissez une connexion à effacer ou éditer"
 
+#: 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
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "Veuillez entrer un nom pour la conférence."
+
+#: plugins/admin/fai/remove_branch.tpl:6
+#, fuzzy
+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 ""
+"Cela inclut toutes les données des comptes, les droits d'accès, la "
+"configuration imap,etc. pour cet utilisateur. Veuillez vous assurez que vous "
+"voulez effectuez cette opération. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr "Adresse de messagerie principale pour ce répertoire partagé"
@@ -5252,57 +5587,57 @@ msgstr "Transférer les messages vers un membre n'appartenant pas au groupe"
 msgid "Groups"
 msgstr "Groupes"
 
-#: plugins/admin/groups/class_groupManagement.inc:276
+#: plugins/admin/groups/class_groupManagement.inc:281
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Vous êtes sur le point de supprimer le groupe '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:282
-#: plugins/admin/groups/class_groupManagement.inc:308
+#: plugins/admin/groups/class_groupManagement.inc:287
+#: plugins/admin/groups/class_groupManagement.inc:313
 msgid "You are not allowed to delete this group!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce groupe!"
 
-#: plugins/admin/groups/class_groupManagement.inc:355
+#: plugins/admin/groups/class_groupManagement.inc:360
 msgid "Create new group"
 msgstr "Créer un nouveau groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:362
+#: plugins/admin/groups/class_groupManagement.inc:367
 #: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:294
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:291
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 msgid "Edit this entry"
 msgstr "Modifier cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:363
+#: plugins/admin/groups/class_groupManagement.inc:368
 #: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:295
-#: plugins/admin/ogroups/class_ogroupManagement.inc:373
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:727
+#: plugins/admin/groups/class_groupManagement.inc:378
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/groups/class_groupManagement.inc:381
 #: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
-#: plugins/gofon/reports/contents.tpl:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/groups/class_groupManagement.inc:391
 msgid "Groupname"
 msgstr "Nom du groupe"
 
-#: plugins/admin/groups/class_groupManagement.inc:391
+#: plugins/admin/groups/class_groupManagement.inc:396
 #: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/ogroups/class_ogroupManagement.inc:398
+#: plugins/admin/ogroups/class_ogroupManagement.inc:397
 msgid "This table displays all groups, in the selected tree."
 msgstr "Ce tableau montre tous les groupes, dans l'arbre sélectionné."
 
@@ -5312,48 +5647,48 @@ msgstr ""
 "Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
 "fichier de configuration!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:167
 msgid "This 'dn' is no group."
 msgstr "Ce 'dn' n'est pas un groupe."
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:281
+#: plugins/admin/groups/class_groupGeneric.inc:284
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:282
+#: plugins/admin/groups/class_groupGeneric.inc:285
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:287
+#: plugins/admin/groups/class_groupGeneric.inc:290
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:621
-#: plugins/admin/ogroups/class_ogroup.inc:526
+#: 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 "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:632
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
-"Le champ 'Name' contient des caractères invalides. Minuscule, chiffre et "
+"Le champ 'Nom' contient des caractères invalides. Minuscule, chiffre et "
 "tirets sont valides."
 
-#: plugins/admin/groups/class_groupGeneric.inc:642
-#: plugins/admin/groups/class_groupGeneric.inc:649
+#: plugins/admin/groups/class_groupGeneric.inc:643
+#: plugins/admin/groups/class_groupGeneric.inc:650
 msgid "Value specified as 'Name' is already used."
-msgstr "La valeur spécifiée dans le champs 'Name' existe déjà."
+msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
 
 #: plugins/admin/groups/remove.tpl:6
 msgid ""
@@ -5383,52 +5718,97 @@ msgstr ""
 "sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
 "travaillez avec un nombre élevé de groupes."
 
-#: plugins/admin/groups/class_groupMail.inc:153
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
+"d'utilisateurs"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Afficher les groupes de base"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Sélectionnez afin d'afficher les groupes Samba"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Afficher les groupes Samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Afficher les groupes applications"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr "Sélectionnez afin d'afficher les groupes ayant la messagerie activée"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Afficher les groupes ayant la messagerie activé"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes normaux ayant uniquement un aspect "
+"fonctionnel"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Afficher les groupes fonctionnels"
+
+#: plugins/admin/groups/class_groupMail.inc:227
 msgid "read"
 msgstr "lecture"
 
-#: plugins/admin/groups/class_groupMail.inc:154
+#: plugins/admin/groups/class_groupMail.inc:228
 msgid "post"
 msgstr "envoyer"
 
-#: plugins/admin/groups/class_groupMail.inc:155
+#: plugins/admin/groups/class_groupMail.inc:229
 msgid "external post"
 msgstr "envoi externe"
 
-#: plugins/admin/groups/class_groupMail.inc:156
+#: plugins/admin/groups/class_groupMail.inc:230
 msgid "append"
 msgstr "ajouter"
 
-#: plugins/admin/groups/class_groupMail.inc:157
+#: plugins/admin/groups/class_groupMail.inc:231
 msgid "write"
 msgstr "écrire"
 
-#: plugins/admin/groups/class_groupMail.inc:182
+#: plugins/admin/groups/class_groupMail.inc:256
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Ce 'dn' n'a pas d'extension mail valide."
 
-#: plugins/admin/groups/class_groupMail.inc:247
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid "You're trying to add an invalid email address "
 msgstr "Vous essayez d'ajouter une adresse mail non valide "
 
-#: plugins/admin/groups/class_groupMail.inc:248
+#: plugins/admin/groups/class_groupMail.inc:322
 msgid "to the list of forwarders."
 msgstr "liste des personnes vers lesquelles les mails seront relayés."
 
-#: plugins/admin/groups/class_groupMail.inc:617
+#: plugins/admin/groups/class_groupMail.inc:811
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
-"Veuillez entrer une adresse de messagerie valide dans le champ 'Primary "
-"address'."
+"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
+"principale'."
 
-#: plugins/admin/groups/class_groupMail.inc:650
+#: plugins/admin/groups/class_groupMail.inc:844
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Veuillez choisir des permissions valables. Les permissions par défaut ne "
 "peuvent pas être vides."
 
-#: plugins/admin/groups/class_groupMail.inc:654
+#: plugins/admin/groups/class_groupMail.inc:848
 msgid "Please select a valid mail server."
 msgstr "Veuillez sélectionner un serveur de messagerie valide."
 
@@ -5437,6 +5817,7 @@ msgid "Object"
 msgstr "Objet"
 
 #: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
 msgid "Choose"
 msgstr "Choisissez"
 
@@ -5448,11 +5829,11 @@ msgstr "Appliquer cet ACL uniquement pour l'entrée de l'utilisateur"
 msgid "Used applications"
 msgstr "Applications utilisées"
 
-#: plugins/admin/groups/application.tpl:6
-msgid "Seperator"
-msgstr ""
+#: plugins/admin/groups/application.tpl:7
+msgid "Add category"
+msgstr "Ajouter une catégorie"
 
-#: plugins/admin/groups/application.tpl:11
+#: plugins/admin/groups/application.tpl:12
 msgid "Available applications"
 msgstr "Applications disponibles"
 
@@ -5466,6 +5847,7 @@ msgstr "Afficher les utilisateurs du département"
 
 #: plugins/admin/groups/group_objects.tpl:39
 #: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/systems/glpiSelectUser.tpl:39
 msgid "Regular expression for matching user names"
 msgstr "Expression régulière concordant avec les noms des utilisateurs"
 
@@ -5489,15 +5871,15 @@ msgstr "Nom posix du groupe"
 msgid "Descriptive text for this group"
 msgstr "Description du groupe"
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:24
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
 msgid "Choose subtree to place group in"
 msgstr "Sélectionnez la branche où sera placée le groupe"
 
 #: plugins/admin/groups/generic.tpl:36
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
-"Normalement les IDs sont générés automatiquement, vous pouvez en spécifié un "
-"manuellement"
+"Normalement les IDs sont générés automatiquement, vous pouvez en spécifier "
+"un manuellement"
 
 #: plugins/admin/groups/generic.tpl:36
 msgid "Force GID"
@@ -5547,15 +5929,15 @@ msgstr "Afficher les adresses du département"
 msgid "Display addresses matching"
 msgstr "Afficher les adresses correspondantes"
 
-#: plugins/admin/groups/class_groupApplication.inc:221
+#: plugins/admin/groups/class_groupApplication.inc:294
 msgid "This 'dn' is no appgroup."
 msgstr "Ce 'dn' n'est pas un groupe d'applications."
 
-#: plugins/admin/groups/class_groupApplication.inc:229
+#: plugins/admin/groups/class_groupApplication.inc:302
 msgid "Remove applications"
 msgstr "Suppression d'applications"
 
-#: plugins/admin/groups/class_groupApplication.inc:230
+#: plugins/admin/groups/class_groupApplication.inc:303
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5563,11 +5945,11 @@ msgstr ""
 "Des applications sont configurées pour ce groupe. Vous pouvez les désactivez "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupApplication.inc:232
+#: plugins/admin/groups/class_groupApplication.inc:305
 msgid "Create applications"
 msgstr "Créer des applications"
 
-#: plugins/admin/groups/class_groupApplication.inc:233
+#: plugins/admin/groups/class_groupApplication.inc:306
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5575,38 +5957,45 @@ msgstr ""
 "Ce groupe ne possède pas d'applications configurées. Vous pouvez en ajouter "
 "en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/groups/class_groupApplication.inc:252
+#: plugins/admin/groups/class_groupApplication.inc:318
+msgid "Invalid character in category name."
+msgstr "Le nom de la catégorie contient des caractères invalides."
+
+#: plugins/admin/groups/class_groupApplication.inc:326
+msgid "The specified category already exists."
+msgstr "Le catégorie indiquée existe déjà."
+
+#: plugins/admin/groups/class_groupApplication.inc:392
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:288
+#: plugins/admin/groups/class_groupApplication.inc:428
 msgid "The selected application has no options."
 msgstr "L'application sélectionnée n'a pas d'options."
 
-#: plugins/admin/groups/class_groupApplication.inc:389
+#: plugins/admin/groups/class_groupApplication.inc:528
 msgid "application"
 msgstr "application"
 
+#: plugins/admin/groups/class_groupApplication.inc:559
+#: plugins/admin/groups/class_groupApplication.inc:595
+msgid "Delete entry"
+msgstr "Supprimer cette entrée"
+
+#: plugins/admin/groups/class_groupApplication.inc:563
 #: plugins/admin/groups/class_groupApplication.inc:593
-#: plugins/admin/applications/class_applicationGeneric.inc:38
-msgid ""
-"There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
-msgstr ""
-"Il n'y a pas de valeur spécifiée pour la variable 'KDE_APPLICATIONS_MENU' "
-"dans votre fichier gosa.conf."
+msgid "Move up"
+msgstr "En haut"
 
-#: plugins/admin/groups/class_groupApplication.inc:601
-#: plugins/admin/groups/class_groupApplication.inc:604
-#: plugins/admin/applications/class_applicationGeneric.inc:46
-#: plugins/admin/applications/class_applicationGeneric.inc:49
-#, php-format
-msgid ""
-"The specified file '%s' for 'KDE_APPLICATIONS_MENU' in your gosa.conf is not "
-"accessable."
-msgstr ""
-"Le fichier '%s' indiqué comme valeur dans la variable "
-"'KDE_APPLICATIONS_MENU' de votre fichier gosa.conf n'est pas accessible."
+#: plugins/admin/groups/class_groupApplication.inc:564
+#: plugins/admin/groups/class_groupApplication.inc:594
+msgid "Move down"
+msgstr "En bas"
+
+#: plugins/admin/groups/class_groupApplication.inc:591
+msgid "Insert seperator"
+msgstr "Insérer un séparateur"
 
 #: plugins/admin/users/password.tpl:2
 msgid ""
@@ -5619,8 +6008,9 @@ msgstr ""
 "mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
 #: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:65 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/class_glpiSelectUser.inc:108 html/getxls.php:68
+#: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -5641,37 +6031,37 @@ msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
 
 #: plugins/admin/users/class_userManagement.inc:488
-#: plugins/admin/systems/class_workstationStartup.inc:49
-#: plugins/admin/ogroups/class_ogroup.inc:235
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/users/class_userManagement.inc:558
+#: plugins/admin/users/class_userManagement.inc:559
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Une personne ayant ce nom existe déjà dans l'annuaire."
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "Create new user"
 msgstr "Création d'un nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "Create new template"
 msgstr "Créer un nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:675
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:682
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_userManagement.inc:689
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
+#: plugins/admin/users/class_userManagement.inc:690
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
@@ -5679,78 +6069,64 @@ msgstr "mot de passe"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/users/class_userManagement.inc:695
 msgid "This table displays all users, in the selected tree."
 msgstr "Ce tableau montre toutes les utilisateurs, dans l'arbre sélectionné."
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:727
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Edit UNIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:731
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
 
-#: plugins/admin/users/class_userManagement.inc:732
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_userManagement.inc:734
+#: plugins/admin/users/class_userManagement.inc:735
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_userManagement.inc:736
+#: plugins/admin/users/class_userManagement.inc:737
 msgid "Edit fax properies"
 msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:740
 msgid "Create user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/class_userManagement.inc:740
+#: plugins/admin/users/class_userManagement.inc:741
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_userManagement.inc:799
+#: plugins/admin/users/class_userManagement.inc:800
 msgid "Online"
-msgstr "en ligne"
+msgstr "En ligne"
 
-#: plugins/admin/users/class_userManagement.inc:806
+#: plugins/admin/users/class_userManagement.inc:807
 msgid "Offline"
-msgstr "hors-ligne"
+msgstr "Hors-ligne"
 
-#: plugins/admin/users/class_userManagement.inc:1019
+#: plugins/admin/users/class_userManagement.inc:1034
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Template"
 msgstr "Modèle"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Créer un nouvel utilisateur à partir d'un modèle"
-
-#: 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 ""
-"La création d'un nouvel utilisateur peut être facilité en utilisant les "
-"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
-"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -5763,6 +6139,7 @@ msgstr ""
 "donné qu'il est impossible pour GOsa de récupérer vos données."
 
 #: plugins/admin/users/headpage.tpl:6
+#: plugins/admin/systems/glpiSelectUser.tpl:6
 msgid "List of users"
 msgstr "Liste des utilisateurs"
 
@@ -5826,6 +6203,20 @@ msgstr "Afficher les utilisateurs proxy"
 msgid "User administration"
 msgstr "Administration des utilisateurs"
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Créer un nouvel utilisateur à partir d'un modèle"
+
+#: 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 ""
+"La création d'un nouvel utilisateur peut être facilité en utilisant les "
+"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
+"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
+
 #: plugins/admin/applications/class_applicationParameters.inc:50
 msgid "Remove options"
 msgstr "Supprimer les options"
@@ -5847,20 +6238,20 @@ msgstr ""
 "Cette application a des options désactivées. Vous pouvez les activer en "
 "cliquant en-dessous."
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:91
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:90
+#: plugins/admin/applications/class_applicationParameters.inc:91
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Valeur par défaut"
 
-#: plugins/admin/applications/class_applicationParameters.inc:101
+#: plugins/admin/applications/class_applicationParameters.inc:102
 msgid "Add option"
 msgstr "Ajouter une option"
 
-#: plugins/admin/applications/class_applicationParameters.inc:152
+#: plugins/admin/applications/class_applicationParameters.inc:154
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr "La valeur '%s' spécifiée pour le nom de l'option est invalide."
@@ -5918,6 +6309,10 @@ msgstr "Placer une icône sur le bureau des membres"
 msgid "Place entry in members startmenu"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
+#: plugins/admin/applications/generic.tpl:82
+msgid "Place entry in members launch bar"
+msgstr "Placer une entrée dans le menu démarrage des membres"
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5954,41 +6349,41 @@ msgstr "Expression régulière pour faire correspondre le nom des applications"
 msgid "Application management"
 msgstr "Gestion des applications"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:102
+#: plugins/admin/applications/class_applicationGeneric.inc:86
 msgid "no example"
 msgstr "pas d'exemple"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:123
+#: plugins/admin/applications/class_applicationGeneric.inc:106
 msgid "This 'dn' is no application."
 msgstr "Ce 'dn' n'est pas une application."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:238
+#: plugins/admin/applications/class_applicationGeneric.inc:214
 msgid "The specified picture has not been uploaded correctly."
 msgstr "L'image spécifiée n'as pas été téléchargée correctement."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:319
+#: plugins/admin/applications/class_applicationGeneric.inc:295
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 "Vous n'avez pas les droits suffisants pour créer une application dans cette "
 "'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:324
+#: plugins/admin/applications/class_applicationGeneric.inc:300
 msgid "Required field 'Name' is not filled."
-msgstr "Le champ obligatoire 'Name' n'est pas rempli."
+msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:328
+#: plugins/admin/applications/class_applicationGeneric.inc:304
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 "Caractère non valide dans le nom de l'application. Seul les caractères de a-"
 "z et 0-9 sont permis."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:332
+#: plugins/admin/applications/class_applicationGeneric.inc:308
 msgid "Required field 'Execute' is not filled."
-msgstr "Le champ obligatoire 'Execute' n'est pas rempli."
+msgstr "Le champ obligatoire 'Exécuter' n'est pas rempli."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:341
+#: plugins/admin/applications/class_applicationGeneric.inc:317
 msgid "There's already an application with this 'Name'."
-msgstr "Une application ayant le même 'Name' existe déjà."
+msgstr "Une application ayant le même 'Nom' existe déjà."
 
 #: plugins/admin/applications/class_applicationManagement.inc:250
 #, php-format
@@ -6001,7 +6396,7 @@ msgid "You are not allowed to delete this application!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
 
 #: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "new"
 msgstr "nouveau"
 
@@ -6094,103 +6489,112 @@ msgstr "Expression régulière pour faire correspondre le nom des applications"
 msgid "Department management"
 msgstr "Gestion des départements"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:143
+#: plugins/admin/departments/class_departmentGeneric.inc:150
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-#: plugins/admin/departments/class_departmentGeneric.inc:152
+#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/admin/departments/class_departmentGeneric.inc:159
 msgid "Department with that 'Name' already exists."
-msgstr "Un département ayant ce 'Name' existe déjà."
+msgstr "Un département ayant ce 'Nom' existe déjà."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:160
+#: plugins/admin/departments/class_departmentGeneric.inc:167
 msgid "Required field 'Description' is not set."
 msgstr "Le champ obligatoire 'Description' n'est pas rempli."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:165
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Le champ 'Name' contient le mot réservé 'incoming'."
+msgstr "Le champ 'Nom' contient le mot réservé 'incoming'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/admin/departments/class_departmentGeneric.inc:173
 msgid " Please choose another name."
 msgstr " Veuillez choisir un autre nom."
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
+#: 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:392
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Departments"
 msgstr "Départements"
 
-#: plugins/admin/departments/class_departmentManagement.inc:188
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:178
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer la branche complète de l'annuaire LDAP "
 "placé sous '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:205
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:202
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
 msgid "You have no permission to remove this department."
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
 
-#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/departments/class_departmentManagement.inc:281
 msgid "Create new department"
 msgstr "Créer un nouveau département"
 
-#: plugins/admin/departments/class_departmentManagement.inc:292
+#: plugins/admin/departments/class_departmentManagement.inc:289
 msgid "This table displays all departments, in the selected tree."
 msgstr "Ce tableau montre tous les départements, dans l'arbre sélectionné."
 
-#: plugins/admin/departments/class_departmentManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:298
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_departmentManagement.inc:395
+#: plugins/admin/departments/class_departmentManagement.inc:392
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/systems/class_terminalInfo.inc:53
-#: plugins/admin/systems/class_terminalInfo.inc:181
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
 msgid "present"
 msgstr "présent"
 
-#: plugins/admin/systems/class_terminalInfo.inc:65
+#: 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:215
-#: 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 "Ce 'dn' n'a pas d'extension de terminaux."
 
-#: plugins/admin/systems/class_terminalInfo.inc:72
+#: plugins/admin/systems/class_terminalInfo.inc:74
+msgid "There is no php snmp module installed, can't gather any informations."
+msgstr ""
+"Le module php snmp n'est pas installé, impossible d'obtenir les informations."
+
+#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:174
+msgid "unknown status"
+msgstr "statut inconnu"
+
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "Ceci est un pseudo-terminal, aucune propriété ne peut être affichée."
 
-#: plugins/admin/systems/class_terminalInfo.inc:92
+#: plugins/admin/systems/class_terminalInfo.inc:107
 msgid "online"
 msgstr "en ligne"
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:163
 msgid "running"
 msgstr "en cours d'exécution"
 
-#: plugins/admin/systems/class_terminalInfo.inc:147
+#: plugins/admin/systems/class_terminalInfo.inc:166
 msgid "not running"
 msgstr "n'est pas en cours d'exécution"
 
-#: plugins/admin/systems/class_terminalInfo.inc:155
-msgid "unknown status"
-msgstr "statut inconnu"
-
-#: plugins/admin/systems/class_terminalInfo.inc:173
+#: plugins/admin/systems/class_terminalInfo.inc:191
 msgid "offline"
 msgstr "hors-ligne"
 
 #: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#, fuzzy
+msgid "Network\tsettings"
 msgstr "Configuration réseau"
 
 #: plugins/admin/systems/network.tpl:8
@@ -6201,28 +6605,58 @@ msgstr "Adresse IP"
 msgid "MAC-address"
 msgstr "Adresse MAC"
 
+#: plugins/admin/systems/network.tpl:28
+#, fuzzy
+msgid "Domain name service"
+msgstr "Service scanner"
+
+#: 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 "Rafraichir"
+
+#: plugins/admin/systems/network.tpl:42
+#, fuzzy
+msgid "DNS-Zone"
+msgstr "Aucun"
+
+#: plugins/admin/systems/network.tpl:50
+msgid "DNS-TTL"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:55
+#: plugins/admin/systems/servdnseditzone.tpl:98
+#, fuzzy
+msgid "DNS Class"
+msgstr "Classe"
+
+#: 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:51
+#: plugins/admin/systems/class_componentGeneric.inc:50
 msgid "This 'dn' has no network features."
 msgstr "Ce 'dn' n'a pas d'extensions réseaux."
 
-#: plugins/admin/systems/class_winGeneric.inc:142
-#: plugins/admin/systems/class_componentGeneric.inc:113
-msgid "The required field 'Component name' is not set."
-msgstr "Le champ obligatoire 'Component name' n'est pas rempli."
-
-#: plugins/admin/systems/class_winGeneric.inc:156
-#: plugins/admin/systems/class_componentGeneric.inc:126
+#: 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 "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
 
-#: plugins/admin/systems/class_winGeneric.inc:166
-#: plugins/admin/systems/class_phoneGeneric.inc:302
-#: 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:214
-#: plugins/admin/systems/class_printGeneric.inc:456
-#: 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 "Une entrée '%s' existe déjà dans la base sélectionnée"
@@ -6283,11 +6717,11 @@ msgstr "Lecteur CDROM"
 #: plugins/admin/systems/workstationService.tpl:83
 #: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
-msgstr "Périphérique Graphique"
+msgstr "Carte écran"
 
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
-msgstr "Périphérique Audio"
+msgstr "Carte son"
 
 #: plugins/admin/systems/info.tpl:93
 msgid "Up since"
@@ -6326,53 +6760,53 @@ msgid "GUI"
 msgstr "Interface graphique"
 
 #: plugins/admin/systems/class_terminalService.inc:83
-#: plugins/admin/systems/class_workstationService.inc:68
+#: plugins/admin/systems/class_workstationService.inc:69
 msgid "default"
 msgstr "défaut"
 
 #: 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 "Afficher le sélecteur"
 
 #: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_workstationService.inc:71
 msgid "direct"
 msgstr "direct"
 
 #: 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 "répartition de charge"
 
 #: 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 "Windows RDP"
 
 #: 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 "Client ICA"
 
 #: 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 "Choisissez le téléphone situé à coté du terminal"
 
-#: plugins/admin/systems/class_terminalService.inc:251
-#: plugins/admin/systems/class_terminalService.inc:256
-#: plugins/admin/systems/class_workstationService.inc:236
-#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
+#: plugins/admin/systems/class_workstationService.inc:240
+#: plugins/admin/systems/class_workstationService.inc:245
 msgid "Please specify a valid VSync range."
 msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
 "verticale."
 
-#: plugins/admin/systems/class_terminalService.inc:266
-#: plugins/admin/systems/class_terminalService.inc:271
-#: plugins/admin/systems/class_workstationService.inc:251
-#: plugins/admin/systems/class_workstationService.inc:256
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
+#: plugins/admin/systems/class_workstationService.inc:255
+#: plugins/admin/systems/class_workstationService.inc:260
 msgid "Please specify a valid HSync range."
 msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
@@ -6584,37 +7018,45 @@ msgstr "Sélectionnez la profondeur des couleurs utilisée en mode graphique"
 msgid "Display device"
 msgstr "Écran"
 
-#: plugins/admin/systems/workstationService.tpl:124
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr "inconnu"
+
+#: 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 "Fréquence de synchronisation Horizontale"
 
-#: 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 "Fréquence de rafraîchissement horizontal pour l'écran installé"
 
-#: plugins/admin/systems/workstationService.tpl:129
+#: plugins/admin/systems/workstationService.tpl:135
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
-msgstr "VSync"
+msgstr "Fréquence de synchronisation verticale"
 
-#: 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 "Fréquence de rafraîchissement verticale pour l'écran installé"
 
-#: plugins/admin/systems/workstationService.tpl:143
+#: plugins/admin/systems/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr "Scanner"
 
-#: 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 "Sélectionner afin de démarrer le service scanner SANE sur le terminal"
 
-#: plugins/admin/systems/workstationService.tpl:145
+#: plugins/admin/systems/workstationService.tpl:151
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr "Fournir des services de scanner"
@@ -6635,11 +7077,11 @@ msgstr "Afficher les membres correspondants"
 msgid "Regular expression for matching member names"
 msgstr "Expression régulière concordant avec les noms des membres"
 
-#: plugins/admin/systems/class_workstationStartup.inc:197
+#: plugins/admin/systems/class_workstationStartup.inc:216
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Veuillez sélectionner un 'serveur FAI' ou effacer les 'Classes FAI'."
 
-#: plugins/admin/systems/class_workstationStartup.inc:251
+#: plugins/admin/systems/class_workstationStartup.inc:270
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -6652,12 +7094,12 @@ msgid "This 'dn' has no phone features."
 msgstr "Ce 'dn' n'a pas d'extensions téléphoniques."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "yes"
 msgstr "oui"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "no"
 msgstr "non"
 
@@ -6669,7 +7111,7 @@ msgstr "dynamique"
 msgid "Networksettings"
 msgstr "Configuration réseau"
 
-#: 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 "
@@ -6678,39 +7120,25 @@ msgstr ""
 "Impossible d'effacer ce téléphone parce que certains utilisateurs "
 "l'utilisent. Un de ces utilisateur est '%s'."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
+#: plugins/admin/systems/class_phoneGeneric.inc:269
 msgid "The required field 'Phone name' is not set."
-msgstr "Le champ obligatoire 'Phone name' n'est pas rempli."
+msgstr "Le champ obligatoire 'Nom du téléphone' n'est pas rempli."
 
-#: 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 "Le 'Phone name' '0' est réservé et ne peut pas être utilisé."
+msgstr "Le 'Nom du téléphone' '0' est réservé et ne peut pas être utilisé."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:279
-#: plugins/admin/systems/class_componentGeneric.inc:116
-msgid "The required field 'MAC-address' is not set."
-msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:282
-#: plugins/admin/systems/class_componentGeneric.inc:119
-msgid "The required field 'IP-address' is not set."
-msgstr "Le champ obligatoire 'IP-address' n'est pas rempli."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:285
-msgid "Wrong IP format in field IP-address."
-msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
 
-#: 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 ""
 "Impossible d'ouvrir '%s', les paramètres du fichier ppd on été réinitialisés."
 
-#: 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 "
@@ -6719,46 +7147,46 @@ msgstr ""
 "Le chemin spécifié PPD_PATH='%s' dans votre fichier de configuration gosa."
 "conf est invalide, je ne peut lire aucune information des fichiers ppd."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:106
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
 msgid "Can't get ppd informations."
 msgstr "Impossible d'obtenir des informations sur les ppd."
 
-#: 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 ""
 "impossible de créer le répertoire '%s' pour sauvegarder le fichier ppd."
 
-#: 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 "Il y a déjà un fichier ppd pour ce type d'imprimante."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:143
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
 #, php-format
 msgid "Can't save file '%s'."
 msgstr "Impossible de sauver le fichier '%s'."
 
-#: 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 "Veuillez indiquer un fichier ppd valide."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:189
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
 msgid "Please select a valid ppd."
 msgstr "Veuillez sélectionner un fichier ppd valide."
 
-#: 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 "Vrai"
 
-#: 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 "Faux"
 
-#: 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 "Type de PPD '%s' non supporté pour '%s' "
@@ -6769,6 +7197,7 @@ msgstr "Nom du serveur"
 
 #: 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 "Action"
@@ -6777,27 +7206,27 @@ msgstr "Action"
 msgid "Select action to execute for this server"
 msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_terminalGeneric.inc:61
 msgid "text"
 msgstr "texte"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:64
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 msgid "graphic"
 msgstr "graphique"
 
-#: 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 "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 
-#: 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
-#: plugins/admin/systems/class_workstationGeneric.inc:101
+#: plugins/admin/systems/class_workstationGeneric.inc:104
 #: plugins/admin/ogroups/class_termgroup.inc:66
 #: plugins/admin/ogroups/class_termgroup.inc:78
 #: plugins/admin/ogroups/class_termgroup.inc:90
@@ -6805,53 +7234,53 @@ msgstr "Aucune définition de WAKECMD n'est présente dans gosa.conf"
 msgid "Execution of '%s' failed!"
 msgstr "L'exécution de '%s' a échoué!"
 
-#: 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 "Aucune définition de REBOOTCMD n'est présente dans gosa.conf"
 
-#: 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 "Aucune définition de HALTCMD n'est présente dans gosa.conf"
 
-#: 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:126
+#: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Switch off"
 msgstr "Eteindre"
 
-#: 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:126
+#: plugins/admin/systems/class_workstationGeneric.inc:131
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: 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:131
+#: plugins/admin/systems/class_workstationGeneric.inc:137
 #: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: 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 "Vous n'avez pas l'autorisation de créer un terminal dans cette 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:249
 msgid "The required field 'Terminal name' is not set."
-msgstr "Le champ obligatoire 'Terminal name' n'est pas renseigné."
+msgstr "Le champ obligatoire 'Nom du terminal' n'est pas renseigné."
 
 #: plugins/admin/systems/printerPPDDialog.tpl:1
 msgid "Printer driver"
 msgstr "Pilote d'Imprimante"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -6906,12 +7335,12 @@ msgstr "Serveur FAI"
 msgid "Assigned FAI classes"
 msgstr "Liste des classes FAI utilisées"
 
-#: plugins/admin/systems/workstationStartup.tpl:65
+#: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr "Modules du kernel (format : nom paramètre)"
 
-#: plugins/admin/systems/workstationStartup.tpl:67
+#: plugins/admin/systems/workstationStartup.tpl:64
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr "Ajouter des modules à charger au démarrage"
@@ -6926,7 +7355,7 @@ msgstr "Ce 'dn' n'a pas d'options serveur."
 
 #: plugins/admin/systems/class_servGeneric.inc:166
 msgid "The required field 'Server name' is not set."
-msgstr "Le champ obligatoire 'Server name' n'est pas rempli."
+msgstr "Le champ obligatoire 'Nom du serveur' n'est pas rempli."
 
 #: plugins/admin/systems/class_servGeneric.inc:173
 msgid "You have no permissions to create a server on this 'Base'."
@@ -7001,7 +7430,7 @@ msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Le service DHCP est activé pour ce serveur. Vous pouvez les désactiver en "
+"Le service DHCP est activé pour ce serveur. Vous pouvez le désactiver en "
 "cliquant sur le bouton ci-dessous."
 
 #: plugins/admin/systems/class_servDHCP.inc:39
@@ -7021,52 +7450,149 @@ msgstr ""
 msgid "Select objects to add"
 msgstr "Sélectionnez les objets à ajouter"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:48
-msgid "Close"
-msgstr "Fermer"
+#: 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 "Il n'y a pas de serveur qui contient un service glpi valide."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:68
-msgid "Activated"
-msgstr "Activé"
+#: 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 ""
+"Impossible de se connecter sur la base de données glpi, l'extension mysql "
+"n'est pas disponible."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:69
-msgid "Locked"
-msgstr "Verouillé"
+#: 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 ""
+"Impossible de se connecter à la base de données glpi, veuillez vérifier la "
+"configuration."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Memory test"
-msgstr "Test mémoire"
+#: 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 "Cette fonctionnalité n'est pas encore implémentée."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:97
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
+#: 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_workstationGeneric.inc:109
-msgid "This 'dn' has no workstation features."
-msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
+#: plugins/admin/systems/class_glpiAccount.inc:303
+#, fuzzy, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:127
-msgid "Instant update"
-msgstr "mise à jour immédiate"
+#: plugins/admin/systems/class_glpiAccount.inc:314
+#, fuzzy
+msgid "Rename failed, this system type name is already used."
+msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:128
-#: plugins/admin/systems/class_workstationGeneric.inc:132
-msgid "Scheduled update"
-msgstr "mise à jour programmée"
+#: plugins/admin/systems/class_glpiAccount.inc:349
+#, fuzzy
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:129
-msgid "Rescan hardware"
-msgstr "Recherche du matériel"
+#: plugins/admin/systems/class_glpiAccount.inc:371
+#, fuzzy, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
+
+#: plugins/admin/systems/class_glpiAccount.inc:383
+#, fuzzy
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
+
+#: plugins/admin/systems/class_glpiAccount.inc:515
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:196
+msgid "Remove inventory service"
+msgstr "Suppression du service d'inventaire"
+
+#: plugins/admin/systems/class_glpiAccount.inc:516
+#, fuzzy
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_glpiAccount.inc:518
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+msgid "Add inventory service"
+msgstr "Ajouter un service d'inventaire"
+
+#: plugins/admin/systems/class_glpiAccount.inc:519
+#, fuzzy
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: 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 "N/A"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+msgid "Activated"
+msgstr "Activé"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "Memory test"
+msgstr "Test mémoire"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:73
+msgid "System analysis"
+msgstr "Analyse du système"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:100
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+msgid "This 'dn' has no workstation features."
+msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:132
+msgid "Instant update"
+msgstr "Mise à jour immédiate"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:133
+#: plugins/admin/systems/class_workstationGeneric.inc:139
+msgid "Scheduled update"
+msgstr "Mise à jour programmée"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:134
+#: plugins/admin/systems/class_workstationGeneric.inc:138
+msgid "Reinstall"
+msgstr "Reinstaller"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:135
+msgid "Rescan hardware"
+msgstr "Recherche du matériel"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:203
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer une station de travail "
 "dans cette 'Base'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:207
 msgid "The required field 'Workstation name' is not set."
-msgstr "Le champ obligatoire 'Workstation name' n'est pas renseigné."
+msgstr ""
+"Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
 
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
@@ -7093,128 +7619,128 @@ msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives aux "
 "composant '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "New Terminal template"
 msgstr "Nouveau modèle de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:569
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:711
 msgid "New Terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "New Workstation template"
 msgstr "Nouveau modèle de station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
-#: plugins/admin/systems/class_systemManagement.inc:711
+#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:712
 msgid "New Workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:572
 msgid "New Server"
 msgstr "Nouveau Serveur"
 
-#: plugins/admin/systems/class_systemManagement.inc:572
+#: plugins/admin/systems/class_systemManagement.inc:573
 msgid "New Printer"
 msgstr "Nouvelle Imprimante"
 
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:574
 msgid "New Phone"
 msgstr "Nouveau Téléphone"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:575
 msgid "New Component"
 msgstr "Nouveau composant"
 
-#: plugins/admin/systems/class_systemManagement.inc:582
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "Edit system"
 msgstr "Editer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:583
+#: plugins/admin/systems/class_systemManagement.inc:582
 msgid "Delete system"
 msgstr "Effacer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:589
+#: plugins/admin/systems/class_systemManagement.inc:587
 msgid "System"
 msgstr "Système"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:623
 msgid "Cups Server"
 msgstr "Serveur Cups"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:624
 msgid "Log Db"
 msgstr "Base de données de logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:627
+#: plugins/admin/systems/class_systemManagement.inc:625
 msgid "Syslog Server"
 msgstr "Serveur de logs systèmes"
 
-#: plugins/admin/systems/class_systemManagement.inc:628
+#: plugins/admin/systems/class_systemManagement.inc:626
 msgid "Mail Server"
 msgstr "Serveur de messagerie"
 
-#: plugins/admin/systems/class_systemManagement.inc:629
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Imap Server"
 msgstr "Serveur Imap"
 
-#: plugins/admin/systems/class_systemManagement.inc:630
+#: plugins/admin/systems/class_systemManagement.inc:628
 msgid "Nfs Server"
 msgstr "Serveur NFS"
 
-#: plugins/admin/systems/class_systemManagement.inc:631
+#: plugins/admin/systems/class_systemManagement.inc:629
 msgid "Kerberos Server"
 msgstr "Serveur Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:632
+#: plugins/admin/systems/class_systemManagement.inc:630
 msgid "Asterisk Server"
 msgstr "Serveur Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:633
+#: plugins/admin/systems/class_systemManagement.inc:631
 msgid "Fax Server"
 msgstr "Serveur de Fax"
 
-#: plugins/admin/systems/class_systemManagement.inc:634
+#: plugins/admin/systems/class_systemManagement.inc:632
 msgid "Ldap Server"
 msgstr "Serveur Ldap"
 
-#: plugins/admin/systems/class_systemManagement.inc:660
+#: plugins/admin/systems/class_systemManagement.inc:661
 msgid "Set root password"
 msgstr "Indiquez le mot de passe administrateur"
 
-#: plugins/admin/systems/class_systemManagement.inc:706
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/ogroups/class_ogroupManagement.inc:488
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:488
+#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/systems/class_systemManagement.inc:713
 msgid "Winstation"
 msgstr "Stations Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:713
+#: plugins/admin/systems/class_systemManagement.inc:714
 msgid "Network Device"
 msgstr "Périphérique réseau"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:939
 msgid "New terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:933
+#: plugins/admin/systems/class_systemManagement.inc:942
 msgid "New workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:950
+#: plugins/admin/systems/class_systemManagement.inc:959
 msgid "Terminal template for"
 msgstr "Modèle de terminal pour "
 
-#: plugins/admin/systems/class_systemManagement.inc:962
+#: plugins/admin/systems/class_systemManagement.inc:971
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
@@ -7262,56 +7788,84 @@ msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
 msgid "Admins"
 msgstr "Administrateurs"
 
-#: 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 "Suppression du service DNS"
 
-#: 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 ""
 "Ce serveur à l'option DNS activée. Vous pouvez le désactiver en cliquant sur "
 "le bouton ci-dessous."
 
-#: 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 "Ajouter un service DNS"
 
-#: 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 ""
 "Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
 
-#: plugins/admin/systems/class_servDB.inc:134
-#: plugins/admin/systems/class_servDB.inc:150
-#: plugins/admin/systems/class_servDB.inc:160
-#: plugins/admin/systems/class_servDB.inc:165
+#: plugins/admin/systems/class_servDNS.inc:240
+#, fuzzy, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
+
+#: plugins/admin/systems/class_servDNS.inc:264
+#, fuzzy
+msgid "Reverse zone"
+msgstr "Références"
+
+#: 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 "La valeur '%s' est vide ou contient des caractères invalides."
 
-#: plugins/admin/systems/class_servDB.inc:140
+#: plugins/admin/systems/class_servDB.inc:151
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr "La chaîne de connexion imap doit être de la forme '%s'."
 
-#: plugins/admin/systems/class_servDB.inc:144
+#: plugins/admin/systems/class_servDB.inc:155
 msgid "The sieve port needs to be numeric."
 msgstr "Le port sieve doit être numérique."
 
-#: plugins/admin/systems/class_servDB.inc:155
+#: plugins/admin/systems/class_servDB.inc:166
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr "Le mot de passe Kerberos est vide."
 
-#: plugins/admin/systems/class_servDB.inc:179
+#: plugins/admin/systems/class_servDB.inc:190
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
 
+#: plugins/admin/systems/servdns.tpl:1
+#, fuzzy
+msgid "Zones"
+msgstr "téléphones"
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Modèle de station de travail"
@@ -7320,27 +7874,39 @@ msgstr "Modèle de station de travail"
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
-#: plugins/admin/systems/class_servNfs.inc:104
+#: plugins/admin/systems/class_servNfs.inc:35
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
+"Le fichier '/etc/gosa/encodings' n'existe pas, impossible d'obtenir la liste "
+"des jeux de caractères supportés."
+
+#: plugins/admin/systems/class_servNfs.inc:38
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr ""
+"Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
+
+#: plugins/admin/systems/class_servNfs.inc:125
 msgid "Please specify a valid path for your setup."
 msgstr "Veuillez entrer un chemin valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:110
+#: plugins/admin/systems/class_servNfs.inc:131
 msgid "Please specify a valid name for your setup."
-msgstr "Veuillez entrer un nom valide pour votre configuration."
+msgstr "Veuillez spécifier un nom valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:113
+#: plugins/admin/systems/class_servNfs.inc:134
 msgid "Please specify a name for your setup."
 msgstr "Veuillez spécifier un nom valide pour votre configuration."
 
-#: plugins/admin/systems/class_servNfs.inc:118
+#: plugins/admin/systems/class_servNfs.inc:139
 msgid "Description contains invalid characters."
 msgstr "La description contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:122
+#: plugins/admin/systems/class_servNfs.inc:143
 msgid "Path contains invalid characters."
 msgstr "Le chemin contient des caractères invalides."
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:147
 msgid "Option contains invalid characters."
 msgstr "L'option contient des caractères invalides."
 
@@ -7366,7 +7932,7 @@ msgstr "utilisateur de la base de données du FAX"
 
 #: plugins/admin/systems/servdb.tpl:42
 msgid "Asterisk management"
-msgstr "administration d'Asterisk"
+msgstr "Administration d'Asterisk"
 
 #: plugins/admin/systems/servdb.tpl:46
 msgid "Asterisk DB user"
@@ -7400,23 +7966,35 @@ msgstr "port Sieve"
 msgid "Logging database"
 msgstr "Base de données des logs"
 
-#: plugins/admin/systems/servdb.tpl:104
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
 msgid "Logging DB user"
 msgstr "Utilisateur de la base de données de log"
 
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Base de données GLPI"
+
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Base de données"
+
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Editer un partage"
+
 #: plugins/admin/systems/servnfs.tpl:2
 msgid "NFS setup"
 msgstr "Préférences NFS"
 
-#: plugins/admin/systems/servnfs.tpl:41
-msgid "Charset"
-msgstr "Type de caractères"
-
-#: plugins/admin/systems/servnfs.tpl:63
+#: plugins/admin/systems/servnfs.tpl:25
 msgid "Path"
 msgstr "Chemin"
 
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/systems/servnfs.tpl:49
+msgid "Codepage"
+msgstr "Codage caractêres"
+
+#: plugins/admin/systems/servnfs.tpl:59
 msgid "Option"
 msgstr "Option"
 
@@ -7486,13 +8064,23 @@ msgstr "pas de réseaux SMTP privilégiés indiqués."
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Pas de relais SMTP indiqué."
 
-#: 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 "Ajouter une extension d'imprimante"
 
-#: 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 "
@@ -7502,12 +8090,12 @@ msgstr ""
 "tant qu'un 'cn' n'est pas présent dans l'entrée. Vous êtes probablement "
 "occupé à créer un nouveau modèle de terminal"
 
-#: 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 "Enlever l'extension d'impression"
 
-#: 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."
@@ -7515,7 +8103,7 @@ msgstr ""
 "Ce stations de travail à l'extension d'imprimante activée. Vous pouvez la "
 "désactiver en cliquant sur le bouton ci-dessous."
 
-#: 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."
@@ -7523,7 +8111,7 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante activée. Vous pouvez la désactiver en "
 "cliquant sur le bouton ci-dessous."
 
-#: 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."
@@ -7531,7 +8119,7 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
 "cliquant sur le bouton ci-dessous."
 
-#: 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."
@@ -7539,34 +8127,34 @@ msgstr ""
 "Ce serveur à l'extension d'imprimante désactivé. Vous pouvez l'activer en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/systems/class_printGeneric.inc:230
+#: plugins/admin/systems/class_printGeneric.inc:260
 msgid "This 'dn' has no printer features."
 msgstr "Ce 'dn' n'a pas d'extensions d'impression."
 
-#: plugins/admin/systems/class_printGeneric.inc:362
+#: plugins/admin/systems/class_printGeneric.inc:396
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr "Le fichier PPD sélectionné '%s' n'existe pas."
 
-#: plugins/admin/systems/class_printGeneric.inc:370
+#: plugins/admin/systems/class_printGeneric.inc:404
 msgid "can't get ppd informations."
 msgstr "Impossible d'obtenir les informations sur le fichier ppd."
 
-#: plugins/admin/systems/class_printGeneric.inc:382
+#: plugins/admin/systems/class_printGeneric.inc:416
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 "Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
 "nom."
 
-#: plugins/admin/systems/class_printGeneric.inc:384
+#: plugins/admin/systems/class_printGeneric.inc:418
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 "Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
 "changer son nom."
 
-#: plugins/admin/systems/class_printGeneric.inc:446
+#: plugins/admin/systems/class_printGeneric.inc:497
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 "Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
@@ -7603,7 +8191,7 @@ msgstr "Service d'option de disponibilité par HTTP (ancien)"
 
 #: plugins/admin/systems/servkolab.tpl:70
 msgid "Amavis email scanning (virus/spam)"
-msgstr "Scan des messages par Amavis (virus/spam)"
+msgstr "Scan des messages par Amavis (antivirus/antispam)"
 
 #: plugins/admin/systems/servkolab.tpl:81
 msgid "Quota settings"
@@ -7686,11 +8274,11 @@ msgstr "Adresse ip par défaut"
 #: plugins/admin/systems/phonesettings.tpl:56
 #: plugins/admin/systems/phonesettings.tpl:93
 msgid "Response timeout"
-msgstr "Dépassement du temps de réponse"
+msgstr "Temps de réponse maximum"
 
 #: plugins/admin/systems/phonesettings.tpl:75
 msgid "Modus"
-msgstr "Moins"
+msgstr "Mode"
 
 #: plugins/admin/systems/phonesettings.tpl:106
 msgid "Authtype"
@@ -7702,11 +8290,11 @@ msgstr "Secret"
 
 #: plugins/admin/systems/phonesettings.tpl:124
 msgid "GoFonInkeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
+msgstr "Mot de passe utilisé pour l'authentification rsa"
 
 #: plugins/admin/systems/phonesettings.tpl:132
 msgid "GoFonOutKeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
+msgstr "Mot de passe utilisé pour l'authentification rsa"
 
 #: plugins/admin/systems/phonesettings.tpl:145
 msgid "Account code"
@@ -7722,7 +8310,7 @@ msgstr "Machines qui peuvent se connecter"
 
 #: plugins/admin/systems/phonesettings.tpl:183
 msgid "Hosts that are not allowed to connect"
-msgstr "Machines qui peuvent pas se connecter"
+msgstr "Machines qui ne peuvent pas se connecter"
 
 #: plugins/admin/systems/phonesettings.tpl:205
 msgid "MSN"
@@ -7776,174 +8364,987 @@ msgstr "Fournir des services d'impression"
 msgid "Spool server"
 msgstr "Serveur de file d'attente"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Sélectionnez le système de fichier NFS où sera placé la file d'attente"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr "Sélectionnez le système de fichier NFS où sera placé la file d'attente"
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Sélectionnez le pilote du scanner"
+
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
+msgstr ""
+"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
+"Veuillez vérifier que vous voulez effectuer cette opération, il est "
+"impossible de revenir en arrière. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
+
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Liste des systèmes"
+
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
+"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
+"une fois."
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "Sélectionnez pour voir les serveurs"
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Afficher les serveurs"
+
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Sélectionnez pour afficher les terminaux Linux"
+
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Afficher les terminaux"
+
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Sélectionnez pour voir les stations de travail Linux"
+
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Afficher les stations de travail"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Afficher les stations de travail Windows"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Sélectionnez pour afficher les imprimantes réseaux"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Afficher les imprimantes réseaux"
+
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Sélectionnez pour afficher les téléphones IP"
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Afficher les téléphones"
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Sélectionnez pour afficher les périphériques réseaux"
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Montrer les périphériques réseau"
+
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Expression régulière pour sélectionner les noms de systèmes"
+
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Afficher les systèmes de l'utilisateur"
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Le nom de l'utilisateur duquel les terminaux sont affichés"
+
+#: plugins/admin/systems/class_componentGeneric.inc:113
+msgid "The required field 'Component name' is not set."
+msgstr "Le champ obligatoire 'Nom du composant' n'est pas rempli."
+
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+"Sélectionnez si le terminal supporte le démarrage graphique avec une barre "
+"de progression"
+
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "utiliser un démarrage en mode graphique"
+
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Indiquez si le terminal démarre en mode texte"
+
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "utiliser le démarrage texte standard de Linux"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "utilisez le mode de débogage pour le démarrage"
+
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Pour changer le mot de passe root du terminal, utilisez le champ ci-dessous. "
+"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
+"mot de passe sinon vous ne pourrez pas vous identifier sans celui-ci."
+
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
+"Laissez le champ vide pour le mot de passe afin de l'obtenir depuis l'entrée "
+"par défaut."
+
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Changer le mot de passe influe seulement sur l'authentification."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+msgid "Printer ppd selection."
+msgstr "Sélection du ppd de votre imprimante."
+
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+msgid "Parent server"
+msgstr "Serveur Père"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/class_servRepository.inc:197
+#: plugins/admin/systems/class_servRepository.inc:218
+msgid "Sections"
+msgstr "Sections"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:116
+msgid "Please enter a value for 'release'."
+msgstr "Veuillez entrer une valeur pour 'la version'"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:120
+msgid "Please specify a valid value for 'url'."
+msgstr "Veuillez spécifier un nom valide pour 'url'."
+
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "Enlever l'extension dépôts FAI."
+
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension dépôts FAI activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr "Ajouter une extension dépôts FAI."
+
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Ce serveur à l'extension dépôts FAI désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
+msgstr "Liste des dépôts configurés."
+
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
+msgstr "Ajouter un dépôt"
+
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+"Ce menu vous permet créer, effacer et éditer des classes des dépôts FAI."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:197
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension inventaire activée. Vous pouvez la désactiver en "
+"cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Ce serveur à l'extension d'inventaire désactivé. Vous pouvez l'activer en "
+"cliquant sur le bouton ci-dessous."
+
+#: 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
+#, fuzzy, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:719
+msgid "since"
+msgstr "depuis"
+
+#: 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 "Renommer"
+
+#: plugins/admin/systems/remove_glpi.tpl:10
+#, fuzzy
+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 ""
+"Il est conseillé de sauvegarder l'arbre de votre annuaire LDAP dans un "
+"fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
+"continuer ou 'Annuler' pour abandonner."
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#, fuzzy
+msgid "Reference"
+msgstr "Références"
+
+#: 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 "Commentaires"
+
+#: 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 "Commentaires"
+
+#: 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 "Fabricant"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+msgid "Technical responsible"
+msgstr "Responsable technique"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
+msgid "use"
+msgstr "utiliser"
+
+#: plugins/admin/systems/glpiSelectUser.tpl:24
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+"Ce dialogue vous permet de désigner un utilisateur comme personne "
+"responsable."
+
+#: plugins/admin/systems/class_termDNS.inc:239
+msgid "The required field 'MAC-address' is not set."
+msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
+
+#: plugins/admin/systems/class_termDNS.inc:244
+msgid "The required field 'IP-address' is not set."
+msgstr "Le champ obligatoire 'adresse IP' n'est pas rempli."
+
+#: plugins/admin/systems/class_termDNS.inc:250
+msgid "Wrong IP format in field IP-address."
+msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
+
+#: plugins/admin/systems/class_termDNS.inc:256
+#, fuzzy
+msgid ""
+"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"':'."
+msgstr ""
+"La mac adresse introduite est invalide. Il doit y avoir 6 fois deux bytes "
+"séparés par ':'."
+
+#: 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 "Site web"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:31
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Numéro de téléphone"
+
+#: 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
+#, fuzzy
+msgid "Display cartridge types matching"
+msgstr "Afficher les imprimantes correspondants"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:39
+#, fuzzy
+msgid "Regular expression for matching cartridge types"
+msgstr "Expression régulière pour sélectionner les adresses correspondantes"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, fuzzy, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Veuillez indiquer un nom."
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#, fuzzy
+msgid "Specified name is already in use, please choose another one."
+msgstr "Le nom de classe indiqué est déjà utilisé pour un objet de ce type."
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Liste des documents liés"
+
+#: 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 ""
+"Ce menu vous permet d'attacher des objets supplémentaires ( comme des "
+"manuels, guides, etc..) à l'ordinateur que vous être en train d'éditer."
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Display attachments matching"
+msgstr "Afficher les documents liées correspondants"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:39
+msgid "Regular expression for matching attachment names"
+msgstr "Expression régulière pour faire correspondre le nom des documents liés"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr "Impossible d'effacer cette entrée elle est encore utilisée"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+msgid "The selected name is already in use."
+msgstr "Le nom spécifié est déjà utilisé."
+
+#: plugins/admin/systems/glpi.tpl:9
+msgid "System type"
+msgstr "Type de système"
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Système d'exploitation"
+
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr "Contacts"
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr "Personne de contact"
+
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Périphériques installés"
+
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Logiciel"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Contrats"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr "Documents liés"
+
+#: plugins/admin/systems/servdnseditzone.tpl:1
+#, fuzzy
+msgid "Zone settings"
+msgstr "Configuration du téléphone"
+
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Nom du téléphone"
+
+#: plugins/admin/systems/servdnseditzone.tpl:17
+#, fuzzy
+msgid "Subnet"
+msgstr "Soumettre"
+
+#: plugins/admin/systems/servdnseditzone.tpl:27
+#, fuzzy
+msgid "SOA record for this zone"
+msgstr "Sections pour cette version"
+
+#: plugins/admin/systems/servdnseditzone.tpl:33
+#, fuzzy
+msgid "Primary dns server for this zone"
+msgstr "Adresse de messagerie principale pour ce répertoire partagé"
+
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Serial number (automatically incremented)"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:61
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Réessayer"
+
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#, fuzzy
+msgid "Expire"
+msgstr "Exporter"
+
+#: plugins/admin/systems/servdnseditzone.tpl:91
+msgid "DNS TTL"
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Liste des périphériques"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:24
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+"Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
+"d'édition."
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Display devices matching"
+msgstr "Afficher les périphériques correspondants"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:39
+msgid "Regular expression for matching device names"
+msgstr "Expression régulière concordant avec les noms des périphériques"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Vous êtes sur le point de supprimer le composant glpi '%s'."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, fuzzy, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr "Impossible d'effacer ce composant tant qu'il est utilisé."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
+msgstr "Pas de fichier valide téléchargé."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
+msgstr "Le téléchargement n'a pas réussi."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+msgstr ""
+"Le répertoire de téléchargement pour gpli '/etc/gosa/glpi' est manquant."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
+msgstr "Il y a déjà un profil avec ce nom de classe."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "Impossible de créer le fichier '%s'."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
+msgstr "Le fichier est disponible."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
+msgstr "Le fichier n'est pas lisible, il est probablement manquant."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
+msgstr "Pas de fichier téléchargé."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
+msgstr "Ce tableau montre tout les fichiers attachés disponibles."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
+msgstr "vide"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
+msgstr "Créer un nouveau fichier attaché"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Nouveau document lié"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+msgid "Please specify a valid name for this attachment."
+msgstr "Veuillez spécifier un nom valide pour ce document lié."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr "Erreur interne, impossible de créer le périphérique de type '%s'"
+
+#: 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 "Vous êtes sur le point de supprimer le périphérique glpi '%s'."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr "Impossible de détecter le nom de l'objet."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, fuzzy, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "périphériques"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "New monitor"
+msgstr "Nouvel écran"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+msgid "M"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Nouvel carte mère"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Nouveau processeur"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Nouveau boitier"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Nouvel carte réseau"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Nouvelle mémoire vive"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Nouveau disque dur"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "Disque dur"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr "Nouveau lecteur"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Nouveau controlleur"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr "Nouvelle carte graphique"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Nouvelle carte son"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr "Nouvelle alimentation"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Nouveau périphérique"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+msgid "You have to specify a valid name for this device."
+msgstr "Veuillez spécifier un nom valide pour ce périphérique."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+msgid "This device name is already in use."
+msgstr "Le nom de ce périphérique est déjà utilisé."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+msgid "Other"
+msgstr "Autres"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Type de l'imprimante"
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr "Interfaces supportées"
+
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Série"
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr "Parallèle"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Cartouches installés"
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Vous êtes sur le point de supprimer le type de toner glpi '%s'."
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, fuzzy, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+"Vous ne pouvez pas effacer ce type de cartouche, il est utilisé actuellement"
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr "Cartouches"
+
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Monitor"
+msgstr "Ecran"
+
+#: plugins/admin/systems/glpi_devices.tpl:31
+msgid "Monitor size"
+msgstr "Taille écran"
+
+#: plugins/admin/systems/glpi_devices.tpl:34
+#, fuzzy
+msgid "Inch"
+msgstr "Français"
+
+#: plugins/admin/systems/glpi_devices.tpl:42
+msgid "Integrated microphone"
+msgstr "Micro intégré"
+
+#: 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 "Oui"
+
+#: 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 "Non"
+
+#: plugins/admin/systems/glpi_devices.tpl:50
+msgid "Integrated speakers"
+msgstr "Haut parleur intègré"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Sélectionnez le pilote du scanner"
+#: plugins/admin/systems/glpi_devices.tpl:58
+msgid "Sub-D"
+msgstr "Sub-D"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
-"Veuillez vérifier que vous voulez effectuer cette opération, il est "
-"impossible de revenir en arrière. Toutes les données seront perdues étant "
-"donné qu'il est impossible pour GOsa de récupérer vos données."
+#: plugins/admin/systems/glpi_devices.tpl:66
+msgid "BNC"
+msgstr "BNC"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste des systèmes"
+#: plugins/admin/systems/glpi_devices.tpl:74
+msgid "Serial number"
+msgstr "Numéro de série"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
-"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
-"une fois."
+#: plugins/admin/systems/glpi_devices.tpl:81
+msgid "Additional serial number"
+msgstr "Numéro de série supplémentaire"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Sélectionnez pour voir les serveurs"
+#: plugins/admin/systems/glpi_devices.tpl:95
+msgid "Other devices"
+msgstr "Autres périphériques"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Afficher les serveurs"
+#: plugins/admin/systems/glpi_devices.tpl:134
+msgid "Power supply"
+msgstr "Alimentation"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Sélectionnez pour afficher les terminaux Linux"
+#: plugins/admin/systems/glpi_devices.tpl:167
+msgid "Atx"
+msgstr "atx"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
+#: plugins/admin/systems/glpi_devices.tpl:175
+msgid "Power"
+msgstr "Puissance électrique"
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Sélectionnez pour voir les stations de travail Linux"
+#: plugins/admin/systems/glpi_devices.tpl:187
+msgid "Gfxcard"
+msgstr "Carte graphique"
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
+#: 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/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
+#: plugins/admin/systems/glpi_devices.tpl:229
+msgid "Ram"
+msgstr "Mémoire vive"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Afficher les stations de travail Windows"
+#: plugins/admin/systems/glpi_devices.tpl:241
+msgid "Controllers"
+msgstr "Controleurs"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Sélectionnez pour afficher les imprimantes réseaux"
+#: plugins/admin/systems/glpi_devices.tpl:297
+msgid "Drive"
+msgstr "Lecteur"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Afficher les imprimantes réseaux"
+#: plugins/admin/systems/glpi_devices.tpl:330
+msgid "Speed"
+msgstr "Vitesse"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Sélectionnez pour afficher les téléphones IP"
+#: plugins/admin/systems/glpi_devices.tpl:346
+msgid "Writeable"
+msgstr "Inscriptible"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Afficher les téléphones"
+#: plugins/admin/systems/glpi_devices.tpl:359
+msgid "Hdd"
+msgstr "Disque dur"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Sélectionnez pour afficher les périphériques réseaux"
+#: plugins/admin/systems/glpi_devices.tpl:392
+msgid "Rpm"
+msgstr "Vitesse"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Montrer les périphériques réseau"
+#: plugins/admin/systems/glpi_devices.tpl:399
+msgid "Cache"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expression régulière pour sélectionner les noms de systèmes"
+#: plugins/admin/systems/glpi_devices.tpl:429
+msgid "RAM"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Afficher les systèmes de l'utilisateur"
+#: plugins/admin/systems/glpi_devices.tpl:462
+msgid "Frequenz"
+msgstr "Fréquence"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Le nom de l'utilisateur duquel les terminaux sont affichés"
+#: plugins/admin/systems/glpi_devices.tpl:491
+msgid "Soundcard"
+msgstr "Carte son"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr ""
-"Sélectionnez si le terminal supporte le démarrage graphique avec une barre "
-"de progression"
+#: plugins/admin/systems/glpi_devices.tpl:535
+msgid "Network interface"
+msgstr "Carte réseau"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Utiliser un démarrage en mode graphique"
+#: plugins/admin/systems/glpi_devices.tpl:568
+msgid "MAC address"
+msgstr "Adresse MAC"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Indiquez si le terminal démarre en mode texte"
+#: plugins/admin/systems/glpi_devices.tpl:586
+msgid "Processor"
+msgstr "Processeur"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "utiliser le démarrage texte standard de Linux"
+#: plugins/admin/systems/glpi_devices.tpl:619
+msgid "Frequence"
+msgstr "Fréquence"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
+#: plugins/admin/systems/glpi_devices.tpl:626
+msgid "Default frequence"
+msgstr "Fréquence par défaut"
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "utilisez le mode de débogage pour le démarrage"
+#: plugins/admin/systems/glpi_devices.tpl:638
+msgid "Motherboard"
+msgstr "Carte mère"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+#: plugins/admin/systems/glpi_devices.tpl:671
+msgid "Chipset"
 msgstr ""
-"Pour changer le mot de passe root du terminal, utilisez le champ ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe sinon vous ne pourrez pas vous identifier sans celui-ci."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/glpi_devices.tpl:682
+msgid "Computer case"
 msgstr ""
-"Laissez le champ vide pour le mot de passe afin de l'obtenir depuis l'entrée "
-"par défaut."
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Changer le mot de passe influe seulement sur l'identification."
+#: plugins/admin/systems/glpi_devices.tpl:715
+msgid "format"
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
-msgstr "Sélection du ppd de votre imprimante."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Document lié"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Nom du fichier"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "type mime"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:149
+#, fuzzy
+msgid "This zoneName is already in use"
+msgstr "Le nom spécifié est déjà utilisé."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:152
+#, fuzzy
+msgid "This reverse zone is already in use"
+msgstr "Le nom de ce périphérique est déjà utilisé."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:151
+#: plugins/admin/ogroups/tabs_ogroups.inc:58
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
 msgid "Phone queue"
 msgstr "Queue téléphonique"
 
-#: 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 "Terminaux"
 
 #: plugins/admin/ogroups/mail.tpl:7
 msgid "Mail distribution list"
-msgstr "Liste de dsitribution"
+msgstr "Liste de distribution"
 
 #: plugins/admin/ogroups/mail.tpl:11
 msgid "Primary mail address for this distribution list"
@@ -8042,82 +9443,86 @@ msgstr "Clients légers"
 msgid "Workstations"
 msgstr "Stations de travail"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:218
+#: plugins/admin/ogroups/class_ogroupManagement.inc:217
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:224
-#: plugins/admin/ogroups/class_ogroupManagement.inc:250
+#: plugins/admin/ogroups/class_ogroupManagement.inc:223
+#: plugins/admin/ogroups/class_ogroupManagement.inc:249
 msgid "You are not allowed to delete this object group!"
 msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 msgid "Create new object group"
 msgstr "Créer un nouveau groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 msgid "Name of object groups"
 msgstr "Nom du groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:441
+#: plugins/admin/ogroups/class_ogroupManagement.inc:440
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:127
+#: plugins/admin/ogroups/class_ogroup.inc:132
 msgid "This 'dn' is no object group."
 msgstr "Ce 'dn' n'est pas un groupe objet."
 
-#: plugins/admin/ogroups/class_ogroup.inc:237
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "too many different objects!"
 msgstr "nombre d'objets différents trop important!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:239
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "users"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/ogroups/class_ogroup.inc:245
 msgid "groups"
 msgstr "groupes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:241
+#: plugins/admin/ogroups/class_ogroup.inc:246
 msgid "applications"
 msgstr "applications"
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "departments"
 msgstr "départements"
 
-#: plugins/admin/ogroups/class_ogroup.inc:243
+#: plugins/admin/ogroups/class_ogroup.inc:248
 msgid "servers"
 msgstr "serveurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "workstations"
 msgstr "stations de travail"
 
-#: plugins/admin/ogroups/class_ogroup.inc:245
+#: plugins/admin/ogroups/class_ogroup.inc:250
 msgid "terminals"
 msgstr "terminaux"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:251
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:247
+#: plugins/admin/ogroups/class_ogroup.inc:252
 msgid "printers"
 msgstr "imprimantes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:254
+#: plugins/admin/ogroups/class_ogroup.inc:259
 msgid "and"
 msgstr "et"
 
-#: plugins/admin/ogroups/class_ogroup.inc:405
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "Non existing dn: "
 msgstr "le dn suivant n'existe pas : "
 
-#: plugins/admin/ogroups/class_ogroup.inc:536
+#: plugins/admin/ogroups/class_ogroup.inc:611
+msgid "There is already an object with this cn."
+msgstr "Il y a déjà un objet avec ce cn."
+
+#: plugins/admin/ogroups/class_ogroup.inc:628
 msgid "You can combine two different object types at maximum only!"
 msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
@@ -8125,7 +9530,7 @@ msgstr "Vous pouvez combiner au maximum deux objets différents !"
 msgid "Name of the group"
 msgstr "Nom du groupe"
 
-#: plugins/admin/ogroups/generic.tpl:33
+#: plugins/admin/ogroups/generic.tpl:32
 msgid "Member objects"
 msgstr "Objets membres"
 
@@ -8190,35 +9595,35 @@ msgstr ""
 "Les queues téléphoniques sont désactivées pour ce groupe. Vous pouvez les "
 "activer en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:199
 msgid "Timeout must be numeric"
 msgstr "Le délai d'attente doit être un chiffre"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 msgid "Retry must be numeric"
 msgstr "Le délai de rappel automatique doit être un chiffre"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Max queue length must be numeric"
 msgstr "La taille maximale de la queue doit être numérique"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Announce frequency must be numeric"
 msgstr "La fréquence du message d'annonce doit être numérique"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:214
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "There must be least one queue number defined."
 msgstr "Il doit y avoir au moins un numéro de queue définie."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:228
+#: plugins/admin/ogroups/class_phonequeue.inc:225
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Il n'y a actuellement aucun serveur asterisk indiqué. Vos paramètres ne "
 "peuvent pas être sauvés."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:238
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -8227,42 +9632,42 @@ msgstr ""
 "Le serveur MySQL '%s' n'est pas joignable avec l'utilisateur '%s', veuillez "
 "vérifier les logs GOsa pour les erreurs mysql."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:251
-#: plugins/admin/ogroups/class_phonequeue.inc:625
-#: plugins/gofon/macro/class_gofonMacro.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:248
+#: plugins/admin/ogroups/class_phonequeue.inc:622
+#: plugins/gofon/macro/class_gofonMacro.inc:216
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:259
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:375
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1044
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Impossible de sélectionner la base de données %s située sur %s."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:282
-#: plugins/admin/ogroups/class_phonequeue.inc:496
-#: plugins/admin/ogroups/class_phonequeue.inc:661
+#: plugins/admin/ogroups/class_phonequeue.inc:279
+#: plugins/admin/ogroups/class_phonequeue.inc:493
+#: plugins/admin/ogroups/class_phonequeue.inc:658
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
-"Impossible d'éffacer dans la base de données %s située sur le serveur %s."
+"Impossible d'effacer dans la base de données %s située sur le serveur %s."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:526
-#: plugins/admin/ogroups/class_phonequeue.inc:528
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:415
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:417
+#: plugins/admin/ogroups/class_phonequeue.inc:523
+#: plugins/admin/ogroups/class_phonequeue.inc:525
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1145
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1147
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:615
-#: plugins/gofon/macro/class_gofonMacro.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:612
+#: plugins/gofon/macro/class_gofonMacro.inc:205
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:364
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -8341,19 +9746,9 @@ msgstr "Numéros de téléphones"
 msgid "Generic queue Settings"
 msgstr "Paramètres par défaut des queues"
 
-#: plugins/admin/ogroups/phonequeue.tpl:18
-msgid "Down"
-msgstr "En bas"
-
 #: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
-msgstr "Temps d'attente"
-
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Réessayer"
+msgstr "Temps d'attente maximum"
 
 #: plugins/admin/ogroups/phonequeue.tpl:62
 msgid "Strategy"
@@ -8455,45 +9850,45 @@ msgstr "Sonner au lieu de mettre un musique d'ambiance"
 msgid "Phone macros"
 msgstr "Macros téléphoniques"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:251
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Vous êtes sur le point de supprimer la macro '%s'."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:282
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
 msgid "You are not allowed to delete this macro!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "Create new phone macro"
 msgstr "Créer une nouvelle macro téléphonique"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:346
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 msgid "Visible"
 msgstr "Visible"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 "Ce tableau montre toutes les macros téléphoniques, dans l'arbre sélectionné."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
 msgid "Macro"
-msgstr "macro"
+msgstr "Macro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
 msgid "visible"
 msgstr "visible"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
 msgid "invisible"
 msgstr "invisible"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:94
+#: plugins/gofon/macro/class_gofonMacro.inc:97
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -8503,12 +9898,12 @@ msgstr ""
 "serveur qui gère asterisk (goFonServer).Vos préférences ne peuvent pas être "
 "sauvées dans la base de données d'asterisk."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:100
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:103
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
 msgid "This 'dn' is no phone macro."
 msgstr "Ce 'dn' n'est pas une macro téléphonique."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:156
+#: plugins/gofon/macro/class_gofonMacro.inc:159
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
@@ -8516,7 +9911,7 @@ msgstr ""
 "Cette macro est toujours utilisée. Pour effacer cette macro, veuillez vous "
 "assurer que personne ne l'utilise."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:188
+#: plugins/gofon/macro/class_gofonMacro.inc:191
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
@@ -8524,54 +9919,55 @@ msgstr ""
 "Il n'y a pas d'extension mysql disponible dans votre configuration de php, "
 "je ne peut pas sauver les changement dans votre base de données asterisk."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:258
+#: plugins/gofon/macro/class_gofonMacro.inc:261
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr "Impossible de lire le contenu de la macro à la ligne: %s"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:276
+#: plugins/gofon/macro/class_gofonMacro.inc:279
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr "Impossible d'exécuter une requête SELECT sur la base de données '%s'"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:285
-#: plugins/gofon/macro/class_gofonMacro.inc:293
+#: plugins/gofon/macro/class_gofonMacro.inc:288
+#: plugins/gofon/macro/class_gofonMacro.inc:296
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr "Impossible d'exécuter une requête DELETE sur la base de données '%s'"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:307
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr "Impossible d'exécuter une requête INSERT sur la base de données '%s'"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:350
+#: plugins/gofon/macro/class_gofonMacro.inc:357
 #, php-format
 msgid "The given cn '%s' already exists."
-msgstr "Le cn '%s' existe déjà."
+msgstr "Le cn indiqué '%s' existe déjà."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:355
+#: plugins/gofon/macro/class_gofonMacro.inc:362
 msgid "You must specify the 'Display Name' in order to save this macro"
-msgstr "Vous devez spécifier le 'Display Name' pour pouvoir sauver cette macro"
+msgstr ""
+"Vous devez spécifier le 'Nom d'affichage' pour pouvoir sauver cette macro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:359
+#: plugins/gofon/macro/class_gofonMacro.inc:366
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 "Le cn introduit est trop long, pour créer une macro le maximum est de 20 "
 "caractères."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:364
+#: plugins/gofon/macro/class_gofonMacro.inc:371
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 "Permissions insuffisantes, vous ne pouvez pas changer l'attribut '%s' dans "
 "la macro goFonMacro"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:370
+#: plugins/gofon/macro/class_gofonMacro.inc:377
 msgid "Makro length must be lower than 100 lines"
 msgstr "La longueur de la macro doit être plus petite que 100 lignes"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:375
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 msgid "Please choose a valid  base."
 msgstr "Veuillez choisir une base valide."
 
@@ -8595,43 +9991,43 @@ msgstr "Visible pour l'utilisateur"
 msgid "Macro text"
 msgstr "Texte de la macro"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:242
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
 msgstr "Chaîne de caractère"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:243
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Combobox"
 msgstr "Boite à choix multiple"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:244
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 msgid "Bool"
 msgstr "Booléen"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:250
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
 msgid "Delete unused"
 msgstr "Supprimer les paramètres inutilisés"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 "Permissions insuffisantes, impossible de changer l'attribut '%s' dans la "
 "macro téléphonique."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:332
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:914
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Le paramètre %s contient des caractères invalides. '!#' est utilisé comme "
 "séparateur"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:337
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr "Le paramètre %s à des valeurs incorrectes par rapport au type booléen."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:366
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -8754,45 +10150,45 @@ msgstr "Choisissez votre téléphone privé"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
 msgid "Voicemail PIN must be between 1-4 characters."
-msgstr "Le PINCODE du répondeur doit être entre 1-4 caractères."
+msgstr "Le code pin de la boîte vocale doit être entre 1-4 caractères."
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
-"Le code pin de la messagerie vocale contient des caractères invalides. Seul "
-"les chiffres sont autorisés."
+"Le code pin de la boîte vocale contient des caractères invalides, seul les "
+"chiffres sont autorisés."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
-msgid "Phone PIN must be 4 characters long."
-msgstr "Le PINCODE du téléphone doit être de 4 caractères."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:894
+msgid "Phone PIN must be at least one character long."
+msgstr "Le code pin du téléphone doit être minimum 1 caractère."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:898
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
 msgid ""
-"The specified phone PIN contains invalid characters, only numeric values are "
-"allowed here."
+"The specified phone PIN contains invalid characters, only aphanumeric values "
+"are allowed here."
 msgstr ""
-"Le codepin du téléphone contient des caractères invalides. Seul les chiffres "
-"sont autorisés."
+"Le code pin du téléphone contient des caractères invalides. Seul les "
+"chiffres et les lettres sont autorisés."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:907
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Vous devez au moins indiquer un numéro de téléphone!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1077
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
 msgid "Stop"
 msgstr "Arrêter"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1111
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
 msgid "Voicemail PIN"
-msgstr "PINCODE du voicemail"
+msgstr "Code PIN de la boite vocale"
 
 #: plugins/gofon/phoneaccount/generic.tpl:41
 msgid "Phone PIN"
@@ -8803,11 +10199,7 @@ msgstr "Code PIN du téléphone"
 msgid "Phone macro"
 msgstr "Macro téléphoniques"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr "Rafraichir"
-
-#: plugins/gofon/phoneaccount/main.inc:121
+#: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
 msgstr "Configuration du téléphone"
 
@@ -8819,28 +10211,28 @@ msgstr "Conférences téléphoniques"
 msgid "Management"
 msgstr "Gestion"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "Create new conference"
 msgstr "Création d'une nouvelle conférence"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 msgid "New conference"
 msgstr "Nouvelle conférence"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 msgid "This table displays all available conference rooms."
 msgstr "Ce tableau montre toutes les salles de conférence disponibles."
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
 msgid "Name - Number"
 msgstr "Nom - numéro"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:317
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 #: plugins/gofon/conference/generic.tpl:107
 msgid "PIN"
-msgstr "PIN CODE"
+msgstr "Code PIN"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:371
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
 msgid "Conference"
 msgstr "Conférence"
 
@@ -8861,14 +10253,9 @@ msgstr "Sélectionnez la branche où sera enregistrée la conférence"
 msgid "Lifetime (in days)"
 msgstr "Durée (en jours)"
 
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Numéro de téléphone"
-
 #: plugins/gofon/conference/generic.tpl:99
 msgid "Preset PIN"
-msgstr "PIN préselectionné"
+msgstr "Code PIN préselectionné"
 
 #: plugins/gofon/conference/generic.tpl:113
 msgid "Record conference"
@@ -8894,32 +10281,32 @@ msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
 msgid "Count users"
 msgstr "Compter les utilisateurs"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:193
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 "Vous avez spécifié une conférence 'sans code PIN' ...veuillez laisser le "
-"champ code PIN vide."
+"champ code pin vide."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:197
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
 msgid "Please enter a PIN."
-msgstr " Veuillez entrer un PIN CODE."
+msgstr " Veuillez entrer un code pin."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:201
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
 msgid "Please enter a name for the conference."
 msgstr "Veuillez entrer un nom pour la conférence."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:205
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
 msgid "Only numeric chars are allowed in Number field."
 msgstr "Seul des chiffres sont permis dans le champ numéro."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:209
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
 msgid "Only numbers are allowed in Lifetime."
 msgstr "Seul des nombres sont autorisés dans la durée."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:349
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
@@ -8949,43 +10336,44 @@ msgstr "Expression régulière concordant avec les noms des utilisateurs"
 msgid "Conference management"
 msgstr "Gestion des conférences"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
+#: plugins/gofon/fonreports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Rapports téléphoniques"
 
-#: plugins/gofon/reports/class_fonreport.inc:150
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 "Impossible de se connecter à la base de données des téléphones, aucun "
 "rapport ne peut être affiché!"
 
-#: plugins/gofon/reports/class_fonreport.inc:154
+#: plugins/gofon/fonreports/class_fonreport.inc:110
 msgid "Can't select phone database for report generation!"
 msgstr ""
 "Impossible de sélectionner la base de données des téléphones pour la "
-"création de rapports!"
+"génération de rapports!"
 
-#: plugins/gofon/reports/class_fonreport.inc:163
+#: plugins/gofon/fonreports/class_fonreport.inc:212
 msgid "Query for phone database failed!"
 msgstr "La requête sur la base de données des téléphones a échoué!"
 
-#: plugins/gofon/reports/contents.tpl:31
+#: plugins/gofon/fonreports/contents.tpl:31
 msgid "Source"
 msgstr "Emetteur"
 
-#: plugins/gofon/reports/contents.tpl:32
+#: plugins/gofon/fonreports/contents.tpl:32
 msgid "Destination"
 msgstr "Destinataire"
 
-#: plugins/gofon/reports/contents.tpl:33
+#: plugins/gofon/fonreports/contents.tpl:33
 msgid "Channel"
 msgstr "Canal"
 
-#: plugins/gofon/reports/contents.tpl:36
+#: plugins/gofon/fonreports/contents.tpl:36
 msgid "Duration"
 msgstr "Durée"
 
-#: plugins/gofon/reports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:5
 msgid "Phone reports"
 msgstr "Rapports téléphoniques"
 
@@ -9101,16 +10489,6 @@ msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 "Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
 
-#: include/class_xmlParse.inc:42
-#, php-format
-msgid "Could not open XML input '%s'."
-msgstr "Impossible d'ouvrir le fichier XML '%s'."
-
-#: include/class_xmlParse.inc:116
-#, php-format
-msgid "XML error in %s : %s at line %d"
-msgstr "Erreur XML dans %s: %s à la ligne %d"
-
 #: include/class_plugin.inc:391
 #, php-format
 msgid ""
@@ -9221,24 +10599,34 @@ msgid "Support for phpgroupware enabled"
 msgstr "Le support de phpgroupware est activé"
 
 #: include/functions_setup.inc:221
-msgid "Support for gofon disabled, no schema seems to be installed"
+#, fuzzy
+msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr "Le support de gofon est désactivé, aucun schéma ne semble installé"
 
 #: include/functions_setup.inc:226
-msgid "Support for gofon enabled"
+#, fuzzy
+msgid "Support for trustAccount enabled"
 msgstr "Le support de gofon est activé"
 
 #: include/functions_setup.inc:231
+msgid "Support for gofon disabled, no schema seems to be installed"
+msgstr "Le support de gofon est désactivé, aucun schéma ne semble installé"
+
+#: include/functions_setup.inc:236
+msgid "Support for gofon enabled"
+msgstr "Le support de gofon est activé"
+
+#: include/functions_setup.inc:241
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 "Le support de l'extension nagios est désactivé, aucun schéma ne semble "
 "installé"
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:246
 msgid "Support for nagios enabled"
 msgstr "Le support de nagios activé"
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:256
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -9246,31 +10634,31 @@ msgstr ""
 "Le support de Kolab est désactivé, aucun schéma ne semble installé, la "
 "méthode de connexion au serveur de messagerie sera cyrus"
 
-#: include/functions_setup.inc:253
+#: include/functions_setup.inc:263
 msgid "Support for Kolab enabled"
 msgstr "Le support de Kolab est activé"
 
-#: include/functions_setup.inc:271
+#: include/functions_setup.inc:281
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:274
+#: include/functions_setup.inc:284
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: include/functions_setup.inc:276
+#: include/functions_setup.inc:286
 msgid "Failed"
 msgstr "Echec"
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 msgid "PHP setup inspection"
 msgstr "Vérification de l'installation de PHP"
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:304
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Vérification de la version de PHP (>=4.1.0)"
 
-#: 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."
@@ -9278,11 +10666,11 @@ msgstr ""
 "PHP doit être en version supérieur à 4.1.0 ou supérieur à cause de certaines "
 "fonctions et bogues connus dans le langage PHP."
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:308
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Vérification de l'option register_globals, elle doit être à 'off'"
 
-#: 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 "
@@ -9293,39 +10681,38 @@ msgstr ""
 "variables. Cela peut constituer un risque de sécurité. GOsa s'exécutera dans "
 "les deux modes."
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:312
 msgid "Checking for ldap module"
 msgstr "Vérification du module LDAP"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 "Ce module est le module de base utilisé par GOsa et est donc indispensable."
 
-#: include/functions_setup.inc:306
+#: include/functions_setup.inc:316
 msgid "Checking for XML functions"
 msgstr "Vérification du support XML"
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:317
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 "Les fonctionnalités XML sont nécessaires pour lire le fichier de "
 "configuration."
 
-#: include/functions_setup.inc:310
+#: include/functions_setup.inc:320
 msgid "Checking for gettext support"
 msgstr "Vérification du support gettext"
 
-#: include/functions_setup.inc:311
-#, fuzzy
+#: include/functions_setup.inc:321
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Gettext est requis afin que GOsa soit localisé."
 
-#: include/functions_setup.inc:314
+#: include/functions_setup.inc:324
 msgid "Checking for iconv support"
 msgstr "Vérification du support iconv"
 
-#: 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."
@@ -9333,11 +10720,11 @@ msgstr ""
 "Ce module est utilisé par GOsa pour convertir les options samba munged dial, "
 "il est indispensable."
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:328
 msgid "Checking for mhash module"
 msgstr "Vérification du module mhash"
 
-#: 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."
@@ -9346,11 +10733,11 @@ msgstr ""
 "seulement les mécanismes crypt ou md5, vous pouvez ignorer ce message. GOsa "
 "marchera sans celui ci."
 
-#: include/functions_setup.inc:322
+#: include/functions_setup.inc:332
 msgid "Checking for imap module"
 msgstr "Vérification du module imap"
 
-#: 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."
@@ -9359,11 +10746,11 @@ msgstr ""
 "permet de récupérer des informations de statuts, créer et supprimer les "
 "comptes de messagerie des utilisateurs."
 
-#: include/functions_setup.inc:326
+#: include/functions_setup.inc:336
 msgid "Checking for getacl in imap"
 msgstr "Vérification de la fonction getacl dans imap"
 
-#: 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 "
@@ -9374,21 +10761,21 @@ msgstr ""
 "Vous devez installer une version récente de PHP afin d'utiliser cette "
 "fonctionnalité."
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:340
 msgid "Checking for mysql module"
 msgstr "Vérification du module pour mysql"
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:341
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Le support de MySQL est nécessaire pour lire  les rapports GOfax en "
 "provenance d'une base de données."
 
-#: include/functions_setup.inc:334
+#: include/functions_setup.inc:344
 msgid "Checking for cups module"
 msgstr "Vérification du module cups"
 
-#: 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."
@@ -9396,11 +10783,11 @@ msgstr ""
 "Afin d'obtenir la liste des imprimantes disponibles avec le protocole IPP à "
 "la place des fichiers printcap, vous devez installer le module CUPS."
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:348
 msgid "Checking for kadm5 module"
 msgstr "Vérification du module kadm5"
 
-#: 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."
@@ -9408,25 +10795,25 @@ msgstr ""
 "Gérer les utilisateurs dans kerberos nécessite le module kadm5 "
 "téléchargeable sur les réseaux PEAR."
 
-#: include/functions_setup.inc:342
+#: include/functions_setup.inc:352
 msgid "Checking for snmp Module"
 msgstr "Vérification du module snmp"
 
-#: include/functions_setup.inc:343
+#: include/functions_setup.inc:353
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr "Le protocole SNMP est nécessaire pour pouvoir surveiller les clients."
 
-#: include/functions_setup.inc:379
+#: include/functions_setup.inc:389
 msgid "PHP detailed function inspection"
 msgstr "Vérification détaillée de l'installation de PHP"
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:393
 #, php-format
 msgid "Checking for function %s"
 msgstr "Vérification de la fonction %s"
 
-#: 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 "
@@ -9435,15 +10822,15 @@ msgstr ""
 "La fonction %s est utilisée par GOsa. Il n'y a pas encore d'information si "
 "celle si est optionnelle ou indispensable."
 
-#: include/functions_setup.inc:395
+#: include/functions_setup.inc:405
 msgid "Checking for some additional programms"
 msgstr "Vérification de programmes additionnels"
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:414
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Vérification de ImageMagick (>=5.4.0)"
 
-#: 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."
@@ -9451,11 +10838,11 @@ msgstr ""
 "ImageMagick est utilisé afin de redimensionner et convertir en JPEG les "
 "images, permettant ainsi leur utilisation dans GOsa."
 
-#: include/functions_setup.inc:408
+#: include/functions_setup.inc:418
 msgid "Checking imagick module for PHP"
 msgstr "Vérification du module imagick pour PHP"
 
-#: 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."
@@ -9463,11 +10850,11 @@ msgstr ""
 "ImageMagick est utilisé afin de redimensionner et convertir en JPEG les "
 "images, permettant ainsi leur utilisation dans GOsa."
 
-#: include/functions_setup.inc:416
+#: include/functions_setup.inc:426
 msgid "Checking for fping utility"
 msgstr "Vérification de l'utilitaire fping"
 
-#: 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."
@@ -9475,12 +10862,12 @@ msgstr ""
 "L'utilitaire fping est utilisé dans le cas d'un environnement composé de "
 "clients légers fonctionnant en terminaux."
 
-#: include/functions_setup.inc:432
+#: include/functions_setup.inc:442
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 "Vérification de la possibilité de générer des mots de passe au format LM/NT"
 
-#: 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."
@@ -9488,11 +10875,11 @@ msgstr ""
 "Afin d'utiliser Samba 2/3, vous devez installer des paquets additionnels "
 "prenant en charge le cryptage des mots de passe."
 
-#: include/functions_setup.inc:446
+#: include/functions_setup.inc:456
 msgid "php.ini check -> session.auto_register"
 msgstr "Vérification de PHP.ini -> session.auto_register"
 
-#: 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'."
@@ -9500,11 +10887,11 @@ msgstr ""
 "Pour pouvoir utiliser GOSa sans problèmes, la variable session.auto_register "
 "doit être a 'Off' dans votre php.ini."
 
-#: include/functions_setup.inc:450
+#: include/functions_setup.inc:460
 msgid "php.ini check -> implicit_flush"
 msgstr "Vérification de PHP.ini -> implicit_flush"
 
-#: include/functions_setup.inc:451
+#: include/functions_setup.inc:461
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -9512,11 +10899,11 @@ msgstr ""
 "Cette option défini la gestion des sorties, mettez cette option a off pour "
 "améliorer la performance."
 
-#: include/functions_setup.inc:458
+#: include/functions_setup.inc:468
 msgid "php.ini check -> max_execution_time"
 msgstr "Vérification de votre PHP.ini pour la variable max_execution_time"
 
-#: 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."
@@ -9524,11 +10911,11 @@ msgstr ""
 "Le temps d'exécution doit être au moins de 30 secondes minimum, parce que "
 "certaines actions vont prendre plus de temps."
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:476
 msgid "php.ini check -> memory_limit"
 msgstr "Vérification de PHP.ini -> memory_limit"
 
-#: 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."
@@ -9537,11 +10924,11 @@ msgstr ""
 "imprévisibles, voire sans message d'erreurs! Augmentez la mémoire pour les "
 "installations plus complexes."
 
-#: include/functions_setup.inc:471
+#: include/functions_setup.inc:481
 msgid "php.ini check -> expose_php"
 msgstr "Vérification de PHP.ini - > expose.php"
 
-#: 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."
@@ -9549,11 +10936,11 @@ msgstr ""
 "PHP n'enverra pas d'information a propos du serveur qui fait tourner "
 "l'application, ceci peut être considérer comme une mesure de sécurité."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "Vérification de PHP ini > magic_quotes_gpc"
 
-#: 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."
@@ -9561,11 +10948,11 @@ msgstr ""
 "Améliorez la sécurité de votre serveur en mettant magic_quotes_gpc à 'on'. "
 "PHP préfixera tout les guillemets dans les chaînes avec la séquence escape."
 
-#: include/functions_setup.inc:720
+#: include/functions_setup.inc:732
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Vous devez spécifier un serveur LDAP afin de pouvoir continuer!"
 
-#: include/functions_setup.inc:729 include/functions_setup.inc:812
+#: 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."
@@ -9573,8 +10960,8 @@ msgstr ""
 "Impossible de se connecter au serveur LDAP! Vérifiez que GOsa puisse le "
 "contacter."
 
-#: include/functions_setup.inc:743 include/functions_setup.inc:817
-#: include/functions_setup.inc:822
+#: 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."
@@ -9582,15 +10969,15 @@ msgstr ""
 "Impossible de s'identifier sur l'annuaire LDAP! Veuillez vérifiez que GOsa "
 "puisse le contacter."
 
-#: include/functions_setup.inc:832
+#: include/functions_setup.inc:844
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
+"please check all information twice"
 msgstr ""
-"Connection au serveur réussie, mais le serveur semble complètement vide, "
+"Connexion au serveur réussie, mais le serveur semble complètement vide, "
 "veuillez vérifier toutes informations un seconde fois"
 
-#: include/functions_setup.inc:888
+#: include/functions_setup.inc:900
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -9599,7 +10986,7 @@ msgstr ""
 "L'attribut obligatoire '%s' n'existe pas pour ce formulaire. Veuillez le "
 "compléter!"
 
-#: include/functions_setup.inc:919
+#: 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"
@@ -9608,13 +10995,13 @@ msgstr ""
 "configuration des vos schémas. Veuillez vérifier qu'elles sont lisibles par "
 "GOsa"
 
-#: include/functions_setup.inc:928
+#: include/functions_setup.inc:940
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Impossible de se connecter au serveur LDAP. Le serveur répond '%s'."
 
-#: include/functions_setup.inc:1038 include/functions_setup.inc:1061
-#: include/functions_setup.inc:1070 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 ""
@@ -9649,24 +11036,24 @@ msgstr ""
 msgid "XML error in guide.xml: %s at line %d"
 msgstr "Erreur XML dans guide.xml: %s à la ligne %d"
 
-#: include/functions_helpviewer.inc:83
+#: include/functions_helpviewer.inc:86
 msgid "No help available for this plugin."
 msgstr "L'aide n'est pas disponible pour cette extension."
 
-#: include/functions_helpviewer.inc:92
+#: include/functions_helpviewer.inc:95
 msgid "previous"
 msgstr "précédent"
 
-#: include/functions_helpviewer.inc:96
+#: include/functions_helpviewer.inc:99
 msgid "next"
 msgstr "suivant"
 
-#: include/functions_helpviewer.inc:384
+#: include/functions_helpviewer.inc:387
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr "%s résultats de votre recherche avec le mot %s interprété comme %s"
 
-#: include/functions_helpviewer.inc:459
+#: include/functions_helpviewer.inc:462
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% trouvés dans le fichier %s"
@@ -9730,7 +11117,7 @@ msgstr "La lecture du fichier PPD %s à échoué - pas de données."
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
 "Impossible d'ouvrir le fichier spécifié, vérifiez que celui ci est existant "
-"et accessible"
+"et/ou accessible"
 
 #: include/class_certificate.inc:53
 msgid "Can't read specified certificate / or empty string given"
@@ -9760,7 +11147,7 @@ msgstr ""
 "La création de cette page à occasionné des erreurs d'après l'interpréteur "
 "PHP!"
 
-#: include/php_setup.inc:71 html/main.php:316
+#: include/php_setup.inc:71 html/main.php:347
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
@@ -9796,23 +11183,23 @@ msgstr "Ligne"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/functions.inc:282
+#: include/functions.inc:290
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr "Erreur lors de la connexion au serveur LDAP. Le serveur répond '%s'."
 
-#: include/functions.inc:303
+#: include/functions.inc:311
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Echec de l'authentification. Le serveur LDAP répond '%s'."
 
-#: include/functions.inc:322
+#: include/functions.inc:330
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique. Veuillez vérifier votre base "
 "de données LDAP."
 
-#: include/functions.inc:360
+#: include/functions.inc:368
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
@@ -9820,7 +11207,7 @@ msgstr ""
 "Erreur lors de la création d'un verrou. Les paramètres sont incorrects. "
 "Veuillez vérifier la source!"
 
-#: include/functions.inc:370
+#: include/functions.inc:378
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -9830,17 +11217,17 @@ msgstr ""
 "l'annuaire LDAP. Veuillez vérifier l'entrée 'config' dans gosa.conf! Le "
 "serveur LDAP répond '%s'."
 
-#: include/functions.inc:385
+#: include/functions.inc:393
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Echec lors de l'ajout d'un verrou. Le serveur LDAP répond '%s'."
 
-#: include/functions.inc:411
+#: include/functions.inc:419
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Echec lors de la suppression d'un verrou. Le serveur LDAP répond '%s'."
 
-#: include/functions.inc:441
+#: include/functions.inc:449
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -9848,7 +11235,7 @@ msgstr ""
 "Echec lors de la récupération du verrou depuis l'annuaire LDAP. Les "
 "paramètres ne sont pas corrects. Veuillez vérifier la source!"
 
-#: include/functions.inc:451
+#: include/functions.inc:459
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -9856,7 +11243,7 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez vérifier l'entrée 'config' dans gosa.conf!"
 
-#: include/functions.inc:459
+#: include/functions.inc:467
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -9864,12 +11251,12 @@ msgstr ""
 "Détection de verrou multiple pour un même objet. Ceci ne devrait pas être "
 "possible. Effacement des références multiples."
 
-#: include/functions.inc:573
+#: include/functions.inc:581
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "La taille limite de %d entrées est dépassée!"
 
-#: include/functions.inc:575
+#: include/functions.inc:583
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -9878,11 +11265,11 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:592
+#: include/functions.inc:600
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:997
+#: include/functions.inc:1008
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -9892,15 +11279,23 @@ msgstr ""
 "d'utilisation par '%s'. Veuillez contacter cette personne afin de clarifier "
 "la situation."
 
-#: include/functions.inc:1096
+#: include/functions.inc:1107
 msgid "LDAP error:"
 msgstr "Erreur LDAP :"
 
-#: include/functions.inc:1550
+#: include/functions.inc:1285
+msgid "Entries per page"
+msgstr "Entrées par page"
+
+#: include/functions.inc:1313
+msgid "Apply filter"
+msgstr "Appliquer le filtre"
+
+#: include/functions.inc:1587
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1593
+#: include/functions.inc:1630
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
@@ -9933,17 +11328,22 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: 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 ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
 "l'administrateur du système."
 
-#: include/class_config.inc:433
+#: include/class_config.inc:448
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
 
-#: include/class_ldap.inc:437
+#: include/class_ldap.inc:479
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "Statut FAI inconnu %s"
+
+#: include/class_ldap.inc:590
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -9952,7 +11352,7 @@ msgstr ""
 "La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
 "rapport à l'équipe de GOsa."
 
-#: 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: ...' "
@@ -9961,22 +11361,21 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: 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 "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
 
-#: 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 ""
 "Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
 "votre fichier LDIF à partir de la ligne %s!"
 
-#: include/class_debconfTemplate.inc:180
-#, fuzzy
+#: include/class_debconfTemplate.inc:251
 msgid "This package has no debconf options."
-msgstr "Ce compte n'est pas d'extension téléphoniques."
+msgstr "Ce paquet n'a pas d'options debconf."
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
@@ -10108,7 +11507,7 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation n'est pas "
 "accessible!"
 
-#: html/index.php:144
+#: html/index.php:151
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -10116,38 +11515,38 @@ msgstr ""
 "GOsa ne peut pas obtenir d'informations sur les schémas installés. Veuillez "
 "vous assurez qu'il puisse les obtenir."
 
-#: html/index.php:152
+#: html/index.php:159
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Votre installation LDAP contient de vieux schémas. Veuillez recommencer "
 "l'installation."
 
-#: html/index.php:180
+#: html/index.php:186
 msgid "Please specify a valid username!"
 msgstr "Le nom d'utilisateur est incorrect!"
 
-#: html/index.php:182
+#: html/index.php:188
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passe!"
 
-#: html/index.php:189
+#: html/index.php:195
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:227
+#: html/index.php:233 html/index.php:293
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/index.php:227
+#: html/index.php:233 html/index.php:293
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
-#: html/helpviewer.php:113
+#: html/helpviewer.php:116
 msgid "There is no helpfile specified for this class."
 msgstr "Il n'y a pas de fichier d'aide spécifiée pour cette classe."
 
-#: html/helpviewer.php:221
+#: html/helpviewer.php:226
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -10166,7 +11565,7 @@ msgstr "Impossible de sélectionner la base de données!"
 msgid "Database query failed!"
 msgstr "Echec des requêtes sur la base de données!"
 
-#: 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."
@@ -10174,24 +11573,61 @@ msgstr ""
 "Register globals est activé. GOsa ne permettra pas aux utilisateurs de se "
 "connecter tant que ceci n'est pas corrigé par un administrateur."
 
-#: html/main.php:157
+#: html/main.php:192
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Attention: la mémoire disponible est insuffisante - Veuillez augmenter le "
 "paramètre memory_limit!"
 
-#: html/main.php:287
+#: html/main.php:325
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Impossible de trouver une définition pour l'extension '%s'!"
 
-#: html/main.php:316
+#: html/main.php:347
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"Generating this page caused the W3C          conformance checker to raise "
+"some errors!"
 msgstr ""
 "La création de cette page à occasionné des erreurs d'après le vérificateur "
 "du W3C!"
 
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr "Impossible d'ouvrir '%s', le fichier n'existe probablement pas."
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Impossible de lire le fichier '%s', vérifiez les permissions"
+
+#: html/get_attachment.php:47
+#, fuzzy
+msgid ""
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
+msgstr ""
+"Impossible de sauver les changement dans votre base de données asterisk, il "
+"n'y a pas d'extension mysql disponible dans votre configuration php."
+
+#: html/get_attachment.php:55
+#, fuzzy
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
+msgstr ""
+"OpenGorupware: Impossible de se connecter à la base de données spécifiée. "
+"Veuillez vérifier la configuration."
+
+#: 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
+#, fuzzy, php-format
+msgid "Can't open file '%s'."
+msgstr "Impossible de sauver le fichier '%s'."
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Conflit détecté entre différentes sessions"
@@ -10206,7 +11642,7 @@ msgstr ""
 "Une autre instance de votre session a été détectée. Les opérations multiples "
 "sont techniquement impossible et dépendent du navigateur utilisé. L'usage de "
 "navigateurs différents en même temps est possible (ex: IE et Mozilla) est "
-"possible. Cliquer sur le bouton  <b>Déconnexion</b> fermera cette session."
+"possible. Cliquer sur le bouton <b>Déconnexion</b> fermera cette session."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
 msgid ""
@@ -10227,7 +11663,6 @@ msgid "Welcome to the GOsa setup!"
 msgstr "Bienvenue dans le menu de configuration de GOsa!"
 
 #: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
@@ -10583,6 +12018,22 @@ msgstr ""
 "seul le serveur web puisse lire gosa.conf. Vous pouvez exécuter les "
 "commandes suivantes pour réaliser cette opération:"
 
+#: ihtml/themes/default/setup_introduction.tpl:4
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic information for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+"Vous lancez GOsa pour la première fois - aucune configuration n'a été "
+"trouvée. L'utilitaire de configuration va essayer de vous aider à obtenir "
+"une configuration utilisable en trois étapes : vérification de la présence "
+"des modules PHP requis, ensuite des programmes requis et optionnels et "
+"finalement des informations permettant à GOsa de se connecter à l'annuaire "
+"LDAP."
+
 #: ihtml/themes/default/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
@@ -10596,9 +12047,8 @@ msgstr ""
 "mentionnées). Ceci est utile si vous savez ce que vous faites."
 
 #: ihtml/themes/default/setup_introduction.tpl:19
-#, fuzzy
 msgid "Toggle Show/Hide"
-msgstr "Switcher Voir/Cacher"
+msgstr "Voir/Cacher"
 
 #: ihtml/themes/default/help.tpl:9
 msgid "GOsa help viewer"
@@ -10611,9 +12061,39 @@ msgstr "Index"
 #: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 "GOsa peut provoquer des erreurs PHP, particulièrement dans le cas des "
 "versions Beta. Dans certains cas il peut être intéressant d'activer "
-"l'affichage des erreurs. (Cela peut représenter un risque de sécurité)  "
+"l'affichage des erreurs."
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr "Votre session GOsa à expiré!"
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+"Votre dernière interaction avec GOsa était il y a un certain temps. Pour des "
+"raisons de sécurité, la session à été fermée. Pour continuer à administrer, "
+"veuillez vous reconnecter."
+
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr "Reconnexion"
+
+#~ msgid "Network settings"
+#~ msgstr "Configuration réseau"
+
+#~ msgid "close"
+#~ msgstr "fermer"
+
+#~ msgid ""
+#~ "Can't delete this device, it is actually in use by some glpi accounts. "
+#~ "Remove this relation first."
+#~ msgstr ""
+#~ "Impossible d'effacer ce périphérique, il est utilisé par plusieurs "
+#~ "comptes glpi. Veuillez d'abord effacer cette(s) relation(s)."