Fixed Translation Strings.

Added Translation Strings.
Added (partially) German Translation.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4207 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index 0410da6f88ab6e250c1fbf0825ebc96383d6eef6..ad9de00359e31ac5bcdc5944eb5868fff4b7f2af 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index fb2279308a5543b1c7fe8fa72232383c124cbca8..50657e2db15d5363e61cba495fe3a01c89298bdc 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -8,21 +8,23 @@
 # This file is distributed under the same license as the GOsa2 package.
 # 
 # 
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
-"PO-Revision-Date: 2006-07-12 15:27+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
+"PO-Revision-Date: 2006-07-18 15:25+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -31,6 +33,7 @@ msgid "Administration"
 msgstr "Administration"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Zusätzliches"
 
@@ -42,18 +45,29 @@ msgstr "Zusätzliches"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -63,7 +77,9 @@ msgstr "Zusätzliches"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Allgemein"
@@ -74,6 +90,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -81,16 +98,21 @@ msgstr "Umgebung"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Mail"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -105,23 +127,28 @@ msgstr "Netatalk"
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Konnektivität"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -133,16 +160,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefon"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -166,6 +196,8 @@ msgid "Parameter"
 msgstr "Parameter"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Start"
@@ -177,8 +209,9 @@ msgstr "Geräte"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -248,6 +281,7 @@ msgstr "Partitionen"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -275,7 +309,7 @@ msgstr "Profile"
 msgid "Summary"
 msgstr "Übersicht"
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Pakete"
 
@@ -390,7 +424,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -436,12 +470,12 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -497,9 +531,9 @@ msgstr "Hinzufügen"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -523,8 +557,8 @@ msgstr "Hinzufügen"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -535,8 +569,8 @@ msgstr "Hinzufügen"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -570,6 +604,7 @@ msgstr "Primäre Adresse"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -593,8 +628,9 @@ msgid "not defined"
 msgstr "nicht definiert"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
@@ -716,14 +752,14 @@ msgstr "Mails abweisen, die größer sind als"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
@@ -754,7 +790,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
@@ -774,7 +810,7 @@ msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -824,7 +860,7 @@ msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
@@ -881,27 +917,27 @@ msgstr ""
 "Die in ihrer gosa.conf angegebene Zustellungs-Methode '%s' ist nicht "
 "verfügbar."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Kann die Kontingent-Einstellungen für '%s' nicht ermitteln."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "Kein DESC-Tag in der Abwesenheits-Datei:"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Dieses Konto hat keine Mail-Erweiterungen."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Mail-Konto entfernen"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -910,13 +946,13 @@ msgstr ""
 "Dieses Konto hat die Mail-Erweiterungen aktiviert. Sie können diese "
 "deaktivieren, indem Sie auf die Schaltfläche unten klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Neues Mail-Konto erzeugen"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -925,59 +961,59 @@ msgstr ""
 "Dieses Konto hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
 "Sie auf die untere Schaltfläche klicken."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Weiterleitungen "
 "aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Das Hinzufügen Ihrer eigenen Adresse zu den Weiterleitungen macht keinen "
 "Sinn."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr "Sie versuchen eine ungültige Mail-Adresse in die Liste aufzunehmen."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, wird bereits von einem "
 "anderen Benutzer verwendet"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Entfernen des Benutzer/Mail-Kontos mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/mail/class_mailAccount.inc:727
-#, fuzzy, php-format
+#: plugins/personal/mail/class_mailAccount.inc:728
+#, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
-msgstr "Speichern des Mail-Kontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/Mail-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Es wurde kein gültiger Mail-Server angegeben, bitte fügen Sie ein passendes "
 "System hinzu."
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Das benötigte Feld 'Primäre Adresse' ist nicht gesetzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
@@ -985,39 +1021,39 @@ msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'Primäre Adresse' "
 "ein."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr ""
 "Die primäre Adresse, welche Sie eingegeben haben, wird bereits benutzt."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "Das Feld 'Kontingent-Größe' enthält einen ungültigen Wert."
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Bitte geben Sie eine gültige Größenbeschränkung für Mails an, die abgewiesen "
 "werden sollen."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr "Warte auf Entfernung der Mail-Einstellungen durch Kolab."
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1025,60 +1061,62 @@ msgstr ""
 "Bitte entfernen Sie zunächst das Mail-Konto, damit Kolab Gelegenheit hat "
 "seine Einstellungen zu entfernen."
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
-#, fuzzy
+#: plugins/personal/mail/class_mailAccount.inc:998
 msgid "Reject due to mailsize"
-msgstr "Mails abweisen, die größer sind als"
+msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: plugins/personal/mail/class_mailAccount.inc:992
-#, fuzzy
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Add vacation information"
-msgstr "Angabe zur Organisationseinheit"
+msgstr "Urlaubsinformationen hinzufügen"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
-#, fuzzy
+#: plugins/personal/mail/class_mailAccount.inc:1005
 msgid "Mail alternative addresses"
-msgstr "Alternative Adressen"
+msgstr "Weitere Adressen"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
@@ -1162,10 +1200,15 @@ msgstr "Zurück"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1227,8 +1270,8 @@ msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1236,16 +1279,17 @@ msgid "Home directory"
 msgstr "Basisverzeichnis"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1265,6 +1309,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1283,7 +1328,7 @@ msgid "Account"
 msgstr "Konto"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "System-Vertrauen"
 
@@ -1583,18 +1628,18 @@ msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
 #: plugins/personal/posix/class_posixAccount.inc:594
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
-msgstr "Entfernen des Proxy-Kontos ist fehlgeschlagen entfernen"
+msgstr "Entfernen von Benutzer/POSIX-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/posix/class_posixAccount.inc:743
 msgid "Failed: overriding lock"
 msgstr "Fehlgeschlagen: Lock wird ignoriert"
 
 #: plugins/personal/posix/class_posixAccount.inc:832
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/posix account with dn '%s' failed."
-msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
+msgstr "Speichern von Benutzer/POSIX-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/posix/class_posixAccount.inc:893
 msgid "The required field 'Home directory' is not set."
@@ -1669,52 +1714,52 @@ msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
 "reserviert werden!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 msgid "POSIX account"
 msgstr "POSIX-Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Spiegeln"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Zeige Pakete"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Zeige Personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "System-Vertrauen"
@@ -1746,7 +1791,7 @@ msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
@@ -1755,7 +1800,7 @@ msgid "Temporary disable samba account"
 msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Domäne"
 
@@ -1764,12 +1809,12 @@ msgid "Terminal Server"
 msgstr "Terminal-Server"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
@@ -1834,17 +1879,17 @@ msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
@@ -1857,7 +1902,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
 
@@ -1940,9 +1985,9 @@ msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
 #: plugins/personal/samba/class_sambaAccount.inc:627
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/samba account with dn '%s' failed."
-msgstr "Entfernen des Samba-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Samba-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
@@ -1982,48 +2027,46 @@ msgstr ""
 "kann keine Umwandlung in eine Samba-Gruppe vorgenommen werden!"
 
 #: plugins/personal/samba/class_sambaAccount.inc:974
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/samba account with dn '%s' failed."
-msgstr "Speichern des Samba-Kontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/Samba-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "Konto läuft ab am"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
-#, fuzzy
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 msgid "Allow user to change password"
-msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
+msgstr "Benutzer darf sein Kennwort ändern"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "Passwort läuft ab am"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Basisverzeichnis"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Anmeldeskript"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
-#, fuzzy
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 msgid "Allow connection from"
-msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
+msgstr "Erlaube Verbindung von"
 
 #: plugins/personal/generic/class_user.inc:256
 msgid "female"
@@ -2064,61 +2107,55 @@ msgstr "ungültig"
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:546
-#, fuzzy, php-format
+#: plugins/personal/generic/class_user.inc:548
+#, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
-msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/generic/class_user.inc:835
-#, fuzzy, php-format
+#: plugins/personal/generic/class_user.inc:837
+#, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
-msgstr "Speichern des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/Allgemeines Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
 "zu verschieben."
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2126,7 +2163,7 @@ msgstr ""
 "Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
 "Datenbank vorhanden."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2134,109 +2171,109 @@ msgstr ""
 "Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
 "Bindestriche sind erlaubt."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Das Feld 'Name' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Das Feld 'Vorname' enthält ungültige Zeichen."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Funktion"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2246,67 +2283,109 @@ msgstr "Postleitzahl"
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Basis"
+
+#: plugins/personal/generic/class_user.inc:1318
 msgid "User password"
 msgstr "Benutzerkennwort"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2319,186 +2398,151 @@ msgstr "Organisation"
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Name der Abteilung"
 
-#: plugins/personal/generic/class_user.inc:1328
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1333
 msgid "Employee number"
-msgstr "Anstellungsart"
+msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:1333
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Benutzerbild"
+
+#: plugins/personal/generic/class_user.inc:1338
 msgid "Room number"
-msgstr "Telefonnummer"
+msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1334
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1339
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1335
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1340
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1336
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 msgid "Pager number"
-msgstr "Telefonnummer"
+msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1337
-#, fuzzy
-msgid "User certificate PKCS12"
-msgstr "Standard-Zertifikat"
+#: plugins/personal/generic/class_user.inc:1342
+msgid "User certificates"
+msgstr "Benutzer-Zertifikate"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1340
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
-msgstr "Seriennumner"
-
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Standard-Zertifikat"
+msgstr "Faxnummer"
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Bild ändern"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr "Name der Vorlage"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Kennung"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Setzen"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Basis"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Wählen Sie den Unterbaum, in den der Benutzer eingepflegt werden soll"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2522,67 +2566,69 @@ msgstr "Wählen Sie den Unterbaum, in den der Benutzer eingepflegt werden soll"
 msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2590,7 +2636,7 @@ msgstr "Mobiltelefon"
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
@@ -2629,8 +2675,8 @@ msgstr "Bild entfernen"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2659,7 +2705,7 @@ msgstr "Standard-Zertifikat"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2693,10 +2739,6 @@ msgstr "Zertifikat-Seriennummer"
 msgid "User settings"
 msgstr "Benutzer-Einstellungen"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Benutzerbild"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Passwort löschen"
@@ -2760,6 +2802,7 @@ msgid "Temporary disable FTP access"
 msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Proxy Konto"
 
@@ -2774,6 +2817,7 @@ msgid "Limit proxy access to working time"
 msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Proxynutzung durch Kontingent einschränken"
 
@@ -2785,21 +2829,44 @@ msgstr "pro"
 msgid "PHPGroupware"
 msgstr "phpGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
+#, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
-msgstr "Entfernen des PHPgw-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/PHPgw-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
+#, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
-msgstr "Speichern des PHPgroupware-Kontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/PHPgw-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr "phpGroupware-Konto"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:3
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Gruppen-Einstellungen"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "Konto läuft ab am"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Konto"
+
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
+msgstr "phpGroupware-Konto"
+
+#: plugins/personal/connectivity/kolab.tpl:3
 #: plugins/personal/connectivity/kolab.tpl:19
 msgid "Kolab account"
 msgstr "Kolab-Konto"
@@ -2813,6 +2880,7 @@ msgstr ""
 "werden, wenn Sie ein Postfach hinzufügen."
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr "Stellvertreter"
 
@@ -2848,17 +2916,19 @@ msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Sie versuchen, eine ungültige Mail-Adresse in die Liste der Stellvertreter "
 "aufzunehmen."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2866,112 +2936,169 @@ msgstr ""
 "Die Adresse, die Sie gerade hinzufügen möchten, ist keine primäre Mail-"
 "Adresse eines bestehenden Benutzers"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr "Immer annehmen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr "Immer ablehnen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr "Im Konfliktfall ablehnen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr "Im Konfliktfall manuell bearbeiten"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Manuell"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
+#, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
-msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Kolab-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "Der Wert für Intervall muß eine Ganzzahl sein."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Der Wert für Information URL is ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Die Einladungs-Richtlinie für die Adresse '%s' ist ungültig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "Es gibt keinen Mail Benutzer mit der Adresse %s für Ihre Einladungs-"
 "Richtlinie!"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
+#, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
-msgstr "Speichern des Kolab-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/Kolab-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Kolab-Konto"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+msgid "Mail size restriction"
+msgstr "Beschränkung der Nachrichtengröße"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Frei/Belegt-Information"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
+#, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
-msgstr "Entfernen des webDAV-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/webDAV-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
+#, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
-msgstr "Sichern des webDAV-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/webDAV-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "WebDAV-Konto"
 
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
+#, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
-msgstr "Entfernen des pureftpd-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/pureftpd-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Upload-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Die von Ihnen angegebene 'Download-Bandbreite' ist nicht gültig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "Das Feld 'Dateien' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "Das Feld 'Größe' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
+#, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
-msgstr "Speichern des pureftpd-Kontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/pureftpd-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "WebDAV-Konto"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+msgid "Ftp"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Fax-Konto erzeugen"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+msgid "Quota files"
+msgstr "Kontingent-Dateien"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+msgid "Upload ratio"
+msgstr "Upload-Verhältnis"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Kontingent-Größe"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+msgid "Download ratio"
+msgstr "Download-Verhältnis"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Upload-Bandbreite"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Download-Bandbreite"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
@@ -3013,30 +3140,31 @@ msgstr "Zeitzone des Benutzers"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr "Die PostgreSQL-Datenbank kann nicht erreicht werden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "Nicht alle benötigten Parameter für OpenXchange Konnektivitätserweiterung "
 "wurden gefunden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "PHP4-Erweiterung für PostgreSQL-Datenbank wurde nicht gefunden!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
+#, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
-msgstr "Entfernen des oxchange-Adressbuchs fehlgeschlagen"
+msgstr ""
+"Entfernen von Benutzer/oxchange-Adressbuchkonto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
@@ -3044,19 +3172,49 @@ msgstr ""
 "Der Open-Xchange Kontoname ist leer und damit ungültig! Überprüfen Sie Ihre "
 "Angaben."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr "Sie verwenden keine ungewöhnlichen Zeichen im Benutzernamen."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
+#, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
-msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
+msgstr "Speichern von Benutzer/oxchange-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
+#, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
-msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
+msgstr "Erstellen von Benutzer/oxchange-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Open-Xchange Konto"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Tage für Termin"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Tage für Aufgabe"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "aktiviert"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Zeitzone des Benutzers"
 
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
@@ -3066,95 +3224,145 @@ msgstr "Intranet-Konto"
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto besitzt keine Konnektivitäts-Erweiterungen."
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Konnektivität"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Konnektivität"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "Stunde"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "Tag"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "Woche"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "Monat"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
+#, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
-msgstr "Entfernen des Proxy-Kontos ist fehlgeschlagen entfernen"
+msgstr "Entfernen von Benutzer/Proxy-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr "Das numerische Feld der Kontingent-Einstellung ist leer."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 "Das numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
+#, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
-msgstr "Speichern des Proxy-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzert/Proxy-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Inhaltsfilterung nur während der Arbeitszeit"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Profil-Kontingent"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Frequenz der Host-Meldungen"
 
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "PPTP-Konto"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
+#, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
-msgstr "Entfernen des Intranet-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Intranet-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
+#, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
-msgstr "Speichern des Intranet-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/Intranet-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Intranet-Konto"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+msgid "GOsa intranet account"
+msgstr "GOsa Intranet-Konto"
 
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "GLPI-Konto"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
+#, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
-msgstr "Entfernen des PPTP-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/PPTP-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
+#, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
-msgstr "Speichern des PPTP-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/PPTP-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr "Opengroupware"
 
@@ -3178,6 +3386,7 @@ msgid "Teams"
 msgstr "Teams"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr "PHPscheduleit-Konto"
 
@@ -3185,21 +3394,31 @@ msgstr "PHPscheduleit-Konto"
 msgid "PHPscheduleit"
 msgstr "PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
+#, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
-msgstr "Entfernen des PHPscheduleit-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/PHPscheduleit-Konto mit dn '%s' fehlgeschlagen."
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
-#, fuzzy, php-format
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
+#, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
-msgstr "Speichern des PHPscheduleit-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/PHPscheduleit-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPscheduleit"
 
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Opengroupware-Konto"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
@@ -3207,18 +3426,28 @@ msgstr ""
 "OpenGroupware: Keine postgresql-Erweiterung verfügbar. Kann keine "
 "Datenbankabfrage durchführen."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr "OpenGroupware: Datenbank-Konfiguration fehlt."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr "OpenGroupware: Die angegebene Datenbank kann nicht erreicht werden."
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Opengroupware-Konto"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Opengroupware-Konto"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "Die Umgebungs-Erweiterung ist zur Zeit deaktiviert."
@@ -3250,7 +3479,7 @@ msgid "Profil quota"
 msgstr "Profil-Kontingent"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr "Profil lokal zwischenspeichern"
 
@@ -3259,7 +3488,7 @@ msgid "Kiosk profile settings"
 msgstr "Kiosk-Profil-Einstellungen"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr "Kiosk-Profil"
 
@@ -3268,24 +3497,26 @@ msgid "Manage"
 msgstr "Verwalten"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr "Auflösung änderbar während des Betriebs"
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Auflösung"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Freigaben"
 
@@ -3489,9 +3720,9 @@ msgstr ""
 "wurde auf 'keins' zurückgesetzt."
 
 #: plugins/personal/environment/class_environment.inc:831
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
-msgstr "Entfernen der Umgebungs-Informationen ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Umgebungs-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/environment/class_environment.inc:884
 msgid "Please set a valid profile quota size."
@@ -3512,18 +3743,18 @@ msgstr ""
 "Sie nicht die nötigen Rechte."
 
 #: plugins/personal/environment/class_environment.inc:1037
-#, fuzzy, php-format
+#, php-format
 msgid "Saving printer membership with dn %s failed "
-msgstr "Speichern des Druckers ist fehlgeschlagen"
+msgstr "Speichern von Drucker-Mitgliedschaft mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/environment/class_environment.inc:1106
 msgid "Error while writing printer settings"
 msgstr "Fehler beim Speichern der Drucker-Einstellungen"
 
 #: plugins/personal/environment/class_environment.inc:1176
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
-msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
+msgstr "Speichern von Benutzer/Umgebungs-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/environment/class_environment.inc:1189
 msgid "group share"
@@ -3534,24 +3765,27 @@ msgid "Administrator"
 msgstr "Administrator"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Standard Drucker"
 
-#: plugins/personal/environment/class_environment.inc:1250
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:1253
 msgid "Environment settings"
-msgstr "Einstellungen der Benutzer-Umgebung"
+msgstr "Umgebungs-Einstellungen"
+
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1263
 msgid "Profile server"
 msgstr "Profilserver"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 msgid "Profile quota"
 msgstr "Profil-Kontingent"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Anmelde-Skript"
@@ -3596,28 +3830,51 @@ msgstr "Skriptname"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3653,7 +3910,7 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3753,30 +4010,37 @@ msgid "Nagios Account"
 msgstr "Nagios-Konto"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Frequenz der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Frequenz der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Optionen der Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Optionen der Host-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Befehle für Dienst-Meldungen"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Befehle für Host-Meldungen"
 
@@ -3841,9 +4105,9 @@ msgstr ""
 "diese aktivieren, indem Sie auf die Schaltfläche unten klicken."
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:147
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/nagios account with dn '%s' failed."
-msgstr "Speichern des Nagios-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/Nagios-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:167
 msgid "The required field 'NagiosAlias' is not set."
@@ -3860,9 +4124,46 @@ msgstr ""
 "Bitte geben Sie eine gültige E-Mail-Adresse in das Feld 'NagiosMail' ein."
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:226
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/nagios account with dn '%s' failed."
-msgstr "Entfernen des Nagios-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Nagios-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+msgid "Nagios account settings"
+msgstr "Nagios-Konto-Einstellungen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+msgid "View all hosts"
+msgstr "Alle Systeme anzeigen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+msgid "View all services"
+msgstr "Alle Dienste anzeigen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Alle System-Befehle ausführen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "Alle Host-Befehle ausführen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Alle Dienst-Befehle ausführen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Konfiguration anzeigen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "System-Informationen anzeigen"
 
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
@@ -3910,14 +4211,27 @@ msgid "You must select a share to use."
 msgstr "Sie müssen eine zu verwendende Freigabe auswählen."
 
 #: plugins/personal/netatalk/class_netatalk.inc:256
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/netatalk account with dn '%s' failed."
-msgstr "Speichern des Netatalk-Kontos ist fehlgeschlagen"
+msgstr "Speichern von Benutzer/Netatalk-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/personal/netatalk/class_netatalk.inc:316
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/netatalk account with dn '%s' failed."
-msgstr "Entfernen des Netatalk-Kontos ist fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Netatalk-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr "Apple Talk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Basisverzeichnis"
 
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
@@ -3925,6 +4239,7 @@ msgstr "Freigabe"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr "Pfad"
 
@@ -3942,13 +4257,16 @@ msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3972,7 +4290,47 @@ msgstr "Gesperrte Nummern"
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Warnung"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Bitte überprüfen Sie genau, was Sie tun. GOsa hat keine Möglichkeit, die "
+"Daten wiederherzustellen."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
+"'Abbrechen' zum Abbruch."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Sperrlistenverwaltung"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Fax-Sperrlisten"
 
@@ -3998,77 +4356,100 @@ msgid "receive"
 msgstr "empfangen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:413
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of blocklist with dn '%s' failed."
-msgstr "Entfernen des Blocklisten-Objekts fehlgeschlagen"
+msgstr "Entfernen von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unter dieser 'Basis' anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht ausgefüllt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Das benötigte Feld 'Name' enthält ungültige Zeichen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "Der angegebene Name wird bereits verwendet."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
 "anzulegen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
-#, fuzzy, php-format
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
+#, php-format
 msgid "Saving of blocklist with dn '%s' failed."
-msgstr "Speichern des Blocklisten-Objekts fehlgeschlagen"
+msgstr "Speichern von Blockliste mit dn '%s' fehlgeschlagen."
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Warnung"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+msgid "Fax Blocklists"
+msgstr "Fax-Sperrlisten"
 
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Bitte überprüfen Sie genau, was Sie tun. GOsa hat keine Möglichkeit, die "
-"Daten wiederherzustellen."
-
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
-"'Abbrechen' zum Abbruch."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Name"
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Sperrlistenverwaltung"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+msgid "Blocklist type"
+msgstr "Typ der Sperrliste"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4207,12 +4588,12 @@ msgstr "Eine Abteilung nach oben"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr "Auf"
 
@@ -4346,7 +4727,7 @@ msgstr "Aktualisieren"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "Bearbeiten"
 
@@ -4373,7 +4754,7 @@ msgstr "Benutzer bearbeiten"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "Entfernen"
 
@@ -4388,7 +4769,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Sprache"
@@ -4398,6 +4781,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Geben Sie die Kommunikations-Sprache für das Fax to Mail-Gateway an"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Auslieferungsformat"
 
@@ -4422,6 +4806,7 @@ msgid "Deliver fax as mail"
 msgstr "Als Mail ausliefern"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Fax an Drucker weiterleiten"
 
@@ -4528,9 +4913,9 @@ msgid "back"
 msgstr "zurück"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of user/fax account with dn '%s' failed."
-msgstr "Entfernen des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Entfernen von Benutzer/Fax-Konto mit dn '%s' fehlgeschlagen."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
@@ -4558,9 +4943,25 @@ msgstr ""
 "angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of user/fax account with dn '%s' failed."
-msgstr "Speichern des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Speichern von Benutzer/Fax-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+msgid "Fax account settings"
+msgstr "Fax-Konto-Einstellungen"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr "FAX aktivieren/deaktivieren"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+msgid "Receive blocklist"
+msgstr "Emfangs-Sperrliste"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+msgid "Send blocklist"
+msgstr "Sende-Sperrliste"
 
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
@@ -4723,39 +5124,14 @@ msgstr "Sie haben keine Berechtigung, ein Fax mit dieser ID einzusehen!"
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Name"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+msgid "Fax report"
+msgstr "Fax-Bericht"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+msgid "Detailed view"
+msgstr "Detaillierte Ansicht"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4883,7 +5259,7 @@ msgstr "Stadt"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Land"
 
@@ -4910,9 +5286,9 @@ msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:180
 #: plugins/addons/addressbook/class_addressbook.inc:650
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of addressbook entry '%s' failed."
-msgstr "Entfernen des Adressbucheintrags ist fehlgeschlagen"
+msgstr "Entfernen von Adressbuch-Eintrag '%s' fehlgeschlagen."
 
 #: plugins/addons/addressbook/class_addressbook.inc:187
 #: plugins/addons/addressbook/class_addressbook.inc:288
@@ -5531,9 +5907,9 @@ msgid "DFS Managment"
 msgstr "DFS-Verwaltung"
 
 #: plugins/addons/godfs/class_dfsManagment.inc:151
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of DFS share with dn '%s' failed."
-msgstr "Entfernen der DFS-Freigabe fehlgeschlagen"
+msgstr "Entfernen von DFS-Freigabe mit dn '%s' fehlgeschlagen."
 
 #: plugins/addons/godfs/class_dfsManagment.inc:170
 msgid "No DFS entries found"
@@ -5582,14 +5958,14 @@ msgid "Required Field \"Location\" is not set."
 msgstr "Das benötigte Feld 'Pfad' ist nicht gesetzt."
 
 #: plugins/addons/godfs/class_dfsgeneric.inc:186
-#, fuzzy, php-format
+#, php-format
 msgid "Saving dfs/generic with dn '%s' failed."
-msgstr "Speichern des allgemeinen Benutzerkontos fehlgeschlagen"
+msgstr "Speichern von DFS/Allgemein mit dn '%s' fehlgeschlagen."
 
 #: plugins/addons/godfs/class_dfsgeneric.inc:219
-#, fuzzy, php-format
+#, php-format
 msgid "Removing dfs/generic with dn '%s' failed."
-msgstr "Entfernen der Netzwerk-Komponente ist fehlgeschlagen"
+msgstr "Entfernen von DFS/Allgemein mit dn '%s' fehlgeschlagen."
 
 #: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
 msgid "Distributed File System Administration"
@@ -5601,7 +5977,8 @@ msgid "Notifications"
 msgstr "Meldungen"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Gruppen"
@@ -5680,12 +6057,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5786,9 +6163,9 @@ msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:496
 #: plugins/admin/groups/class_groupGeneric.inc:693
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of groups/generic with dn '%s' failed."
-msgstr "Entfernen der Anwendung von der Gruppe '%s' ist fehlgeschlagen"
+msgstr "Entfernen von Gruppe/Allgemein mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/groups/class_groupGeneric.inc:603
 #, php-format
@@ -5820,6 +6197,31 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+msgid "Generic group settings"
+msgstr "Allgemeine Gruppeneinstellungen"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Mitglieder sind in einer Telefon-Gruppe"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+msgid "Nagios group"
+msgstr "Nagios-Gruppe"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+msgid "Group member"
+msgstr "Gruppenmitglieder"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+msgid "Samba group type"
+msgstr "Samba-Gruppentyp"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+msgid "Samba SID"
+msgstr "Samba SID"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Release-Fokus"
@@ -5840,7 +6242,8 @@ msgstr "Kategorie hinzufügen"
 msgid "Available applications"
 msgstr "Verfügbare Anwendungen"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "lesen"
 
@@ -5856,7 +6259,8 @@ msgstr "extern posten"
 msgid "append"
 msgstr "anhängen"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "schreiben"
 
@@ -5873,14 +6277,14 @@ msgid "to the list of forwarders."
 msgstr "zur Liste der Weiterleitungen hinzuzufügen."
 
 #: plugins/admin/groups/class_groupMail.inc:613
-#, fuzzy, php-format
+#, php-format
 msgid "Removing of groups/mail with dn '%s' failed."
-msgstr "Entfernen der Gruppen-Mail-Einstellungen ist fehlgeschlagen"
+msgstr "Entfernen von Gruppe/Mail mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/groups/class_groupMail.inc:777
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of groups/mail with dn '%s' failed."
-msgstr "Speichern der Mail-Einstellungen für die Gruppe fehlgeschlagen"
+msgstr "Speichern von Gruppe/Mail mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/groups/class_groupMail.inc:806
 msgid "Please enter a valid email addres in 'Primary address' field."
@@ -5899,6 +6303,25 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Gruppenname"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+msgid "Alternate addresses"
+msgstr "Weitere Adressen"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+msgid "Forwarding addresses"
+msgstr "Weiterleitungs-Adressen"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Berechtigungen"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Ordner-Administratoren"
@@ -5989,18 +6412,6 @@ msgstr "Zeige die Benutzer der Abteilung"
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Anwendungsoptionen"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
@@ -6111,6 +6522,38 @@ msgstr ""
 "Der Release-Name '%s' kann nicht aufgelöst werden. Nehme '%s' als neuen "
 "Release-Namen an."
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+msgid "Group applications"
+msgstr "Anwendungen der Gruppe"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Anwendung"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+msgid "Application parameter"
+msgstr "Anwendungs-Parameter"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Anwendungsoptionen"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Gruppen-Einstellungen"
@@ -6198,14 +6641,6 @@ msgstr "Neue Gruppe erstellen"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Anwendung"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6320,6 +6755,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Vorlage"
 
@@ -6479,7 +6915,9 @@ msgid "Application name"
 msgstr "Name der Anwendung"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Angezeigter Name"
 
@@ -6489,6 +6927,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Angezeigter Name der Anwendung (z.B. unter Symbole)"
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6508,7 +6947,9 @@ msgid "Choose subtree to place application in"
 msgstr "Wählen Sie den Teilbaum, in den die Anwendung plaziert werden soll."
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Symbol"
 
@@ -6522,22 +6963,27 @@ msgid "Reload picture from LDAP"
 msgstr "Bild neu laden"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Nur ausführbar für Gruppen-Mitglieder"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Konfiguration bei jedem Start ersetzen"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder"
 
@@ -6579,6 +7025,7 @@ msgstr ""
 "Schaltfläche unten hinzufügen."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variable"
 
@@ -6686,6 +7133,19 @@ msgstr "Speichern der Anwendung mit dn '%s' fehlgeschlagen."
 msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Name der Anwendung"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+msgid "Script content"
+msgstr "Skript-Inhalt"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6750,6 +7210,7 @@ msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Kategorie"
 
@@ -6783,6 +7244,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Einleitende Fax-Nummer dieses Unterbaums"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Administrative Einstellungen"
 
@@ -6791,10 +7253,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 "Verschieben des Baums ist fehlgeschlagen: Der Zielbaum ist ein Unterbaum des "
@@ -6851,27 +7313,27 @@ msgstr ""
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Entfernen der Abeilung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung eine Abteilung unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Eine Abteilung mit diesem Namen existiert bereits."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Das benötigte Feld 'Beschreibung' ist nicht gesetzt."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -6879,47 +7341,61 @@ msgstr ""
 "Das Feld 'Name' enthält das reservierte Wort '%s'. Bitte wählen Sie einen "
 "anderen Namen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 "Kritischer Fehler: Kann keine unbenutzte Marke finden, um die administrative "
 "Einheit zu kennzeichnen!"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Speichern der Abteilung mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markiere '%s'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verschiebe '%s' nach '%s'"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Objekt"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Fehler beim kopieren von %s, breche ab"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Abteilungen"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Telefon"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Name der Abteilung"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6936,20 +7412,6 @@ msgstr "Sie haben keine Berechtigung, diese Abteilung zu entfernen."
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Telefon"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Name der Abteilung"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -7000,6 +7462,7 @@ msgid "Enable DNS for this device"
 msgstr "DNS für dieses Gerät aktivieren"
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -7012,6 +7475,8 @@ msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7081,11 +7546,14 @@ msgid "Terminal Service"
 msgstr "Terminal-Dienst"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Anmeldung sperren (temporär)"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Schrift-Suchpfad"
@@ -7256,8 +7724,11 @@ msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Modus"
 
@@ -7269,7 +7740,9 @@ msgstr "Wählen Sie den Terminal-Modus"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Protokoll-Server"
 
@@ -7280,6 +7753,7 @@ msgid "Choose server to use for logging"
 msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Root-Server"
 
@@ -7288,6 +7762,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
 
@@ -7438,6 +7913,111 @@ msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Speichern der Terminal-Dienst Informationen ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+msgid "Service"
+msgstr "Dienst"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr "Terminal-Dienst"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+msgid "Monitor"
+msgstr "Monitor"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+msgid "Method"
+msgstr "Methode"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Entfernte Arbeitsfläche"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+msgid "Gfx driver"
+msgstr "Grafiktreiber"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+msgid "Gfx resolution"
+msgstr "Auflösung"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+msgid "Gfx color depth"
+msgstr "Farbtiefe"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+msgid "Vsync"
+msgstr "VSync"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+msgid "Printer service enabled"
+msgstr "Druck-Dienst aktiviert"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Spool-Server"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+msgid "Scanner enabled"
+msgstr "Scanner aktiviert"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+msgid "Scanner model"
+msgstr "Scanner-Modell"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+msgid "Keyboard model"
+msgstr "Tastatur-Modell"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+msgid "Keyboard layout"
+msgstr "Tastatur-Layout"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+msgid "Keyboard variant"
+msgstr "Tastatur-Variante"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+msgid "Mouse type"
+msgstr "Maus-Typ"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+msgid "Mouse port"
+msgstr "Maus-Anschluß"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Telefon-Hardware"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7453,6 +8033,27 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Speichern der Terminal-Start Informationen ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+msgid "Terminal startup"
+msgstr "Terminal-Start"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+msgid "Ldap server"
+msgstr "LDAP-Server"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Boot-Kernel"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Überprüfe Parameter"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Server-Name"
@@ -7470,6 +8071,7 @@ msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
@@ -7499,10 +8101,6 @@ msgstr "Drucker URL"
 msgid "Driver"
 msgstr "Treiber"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Berechtigungen"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
@@ -7617,15 +8215,46 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:45
-msgid "Activated"
-msgstr "Aktiv"
-
-#: plugins/admin/systems/class_servGeneric.inc:67
-msgid "This 'dn' has no server features."
-msgstr "Diese 'dn' hat keine Server-Erweiterungen."
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Terminal-Dienst"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+msgid "Ntp server settings"
+msgstr "NTP-Dienst-Einstellungen"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Aktion"
+
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:45
+msgid "Activated"
+msgstr "Aktiv"
+
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
+msgstr "Diese 'dn' hat keine Server-Erweiterungen."
 
 #: plugins/admin/systems/class_servGeneric.inc:75
 #: plugins/admin/systems/class_workstationGeneric.inc:140
@@ -7686,6 +8315,16 @@ msgstr ""
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Server-Name"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+msgid "Goto mode"
+msgstr "GOto-Modus"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "DHCP-Dienst entfernen"
@@ -7742,6 +8381,24 @@ msgstr "Das benötigte Feld 'Arbeiststationsname' ist nicht gesetzt."
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Speichern der Arbeitsstations-Dienste ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Name der Arbeitsstation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Arbeitsstation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+msgid "Ntp server"
+msgstr "NTP-Dienst"
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Systeme"
@@ -7798,19 +8455,6 @@ msgstr "Arbeitsstations-Vorlage für"
 msgid "New System from incoming"
 msgstr "Neu erkanntes Gerät"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Arbeitsstation"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr "Arbeitsstation installiert gerade"
@@ -7858,6 +8502,7 @@ msgid "Zones"
 msgstr "Zonen"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix 'mydomain'"
 
@@ -7866,22 +8511,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix 'mydestination'"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "POP3-Dienst"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "POP3/SSL-Dienst"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "IMAP-Dienst"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "IMAP/SSL-Dienst"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Sieve-Dienst"
 
@@ -7898,6 +8548,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Email scannen (Virus/Spam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Kontingent-Einstellungen"
 
@@ -7911,6 +8562,7 @@ msgstr ""
 "Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "SMTP privilegierte Netzwerke"
 
@@ -7935,6 +8587,7 @@ msgid "Host used to relay mails"
 msgstr "Host für Mail Relay"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Akzeptiere Internet-Mail"
 
@@ -7973,6 +8626,7 @@ msgstr ""
 "diese durch einen Klick auf die Schaltfläche unten aktivieren."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Reverse Zone"
 
@@ -8011,9 +8665,48 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 msgid "DNS service"
 msgstr "DNS-Dienst"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr "DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Zonenname"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+msgid "Primary dns server"
+msgstr "Primärer DNS-Server"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Seriell"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Wiederholen"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Ablauf"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Zonen-Einträge"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Kerberos-Zugang via kadmin"
@@ -8025,6 +8718,7 @@ msgstr "Kerberos Realm"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Administrator"
 
@@ -8061,16 +8755,19 @@ msgstr "IMAP-Administrationszugang"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Serverbezeichnung"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Verbindungs-URL"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Sieve-Port"
 
@@ -8091,6 +8788,7 @@ msgid "Glpi database"
 msgstr "Glpi-Datenbank"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Datenbank"
@@ -8099,6 +8797,72 @@ msgstr "Datenbank"
 msgid "Machine name"
 msgstr "Name des Systems"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr "Fax-Dienst"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr "Konfiguration der Fax-Datenbank"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Entfernen von Server-Dienste/GOfax mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Speichern von Server-Dienste/GOfax mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Das Attribut Benutzer ist leer oder enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Das Attribut Kennwort ist leer oder enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das als ACTION_HOOK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+msgid "Fax server"
+msgstr "Fax-Dienst"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+msgid "Fax server service"
+msgstr "Fax-Dienst"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+msgid "Login name"
+msgstr "Anmeldename"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -8163,6 +8927,38 @@ msgstr "Kolab Mail-Dienst"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+msgid "Kolab service"
+msgstr "Kolab-Dienst"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Ziel"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "HTTP Frei/Belegt-Dienst (alt)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr "Virus-Scan aktivieren"
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Relay host"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "HTTP Frei/Belegt-Dienst (alt)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8286,6 +9082,19 @@ msgstr ""
 msgid "Group"
 msgstr "Gruppe"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Druck-Dienst"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+msgid "Printer PPD"
+msgstr "Drucker-PPD"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8331,6 +9140,63 @@ msgstr "Das Feld 'IP-Adresse' enthält eine ungültige Adresse."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Neue Netzwerk-Komponente"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+msgid "Network device"
+msgstr "Netzwerk-Gerät"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Wählen Sie die Art der System-Komponente, die Sie anlegen möchten"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Linux Terminals und Arbeitsstationen werden beim Systemstart automatisch "
+"hinzugefügt. Aus diesem Grund können Sie für diese Systemtypen nur Vorlagen "
+"für einen Unterbaum anlegen. Server werden ebenfalls automatisch "
+"hinzugefügt, in einigen Fällen benötigen Sie Pseudo-Einträge um GOsa mit "
+"benötigten Informationen zu versorgen. Weitere Netzwerk-Komponenten können z."
+"B. für Nagios Umgebungen genutzt werden um die Abhängigkeiten aufzulösen."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Linux Thin-Client Vorlage"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Linux Arbeitsstations-Vorlage"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Linux Server"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Windows Arbeitsstation"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Netzwerk-Drucker"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Andere Netzwerk-Komponente"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Anlegen"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 msgid "Time server"
 msgstr "Zeit-Server"
@@ -8340,6 +9206,7 @@ msgid "Printer type"
 msgstr "Druckertyp"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8353,6 +9220,7 @@ msgstr "Druckertyp"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr "Hersteller"
@@ -8361,10 +9229,6 @@ msgstr "Hersteller"
 msgid "Supported interfaces"
 msgstr "Unterstützte Schnittstellen"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Seriell"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr "Parallel"
@@ -8378,11 +9242,15 @@ msgid "Contacts"
 msgstr "Kontakte"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr "Technischer Kontakt"
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Kontaktperson"
 
@@ -8394,75 +9262,29 @@ msgstr "Anhänge"
 msgid "Installed cartridges"
 msgstr "Installierte Patronen"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Wählen Sie die Art der System-Komponente, die Sie anlegen möchten"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Freigabe bearbeiten"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Linux Terminals und Arbeitsstationen werden beim Systemstart automatisch "
-"hinzugefügt. Aus diesem Grund können Sie für diese Systemtypen nur Vorlagen "
-"für einen Unterbaum anlegen. Server werden ebenfalls automatisch "
-"hinzugefügt, in einigen Fällen benötigen Sie Pseudo-Einträge um GOsa mit "
-"benötigten Informationen zu versorgen. Weitere Netzwerk-Komponenten können z."
-"B. für Nagios Umgebungen genutzt werden um die Abhängigkeiten aufzulösen."
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr "NFS-Einrichtung"
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Linux Thin-Client Vorlage"
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
+msgid "Volume"
+msgstr "Volume"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Linux Arbeitsstations-Vorlage"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Linux Server"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Windows Arbeitsstation"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Netzwerk-Drucker"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Andere Netzwerk-Komponente"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Anlegen"
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Freigabe bearbeiten"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "NFS-Einrichtung"
-
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Volume"
-msgstr "Volume"
-
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr "Freigabe auf Apple-Systemen automatisch einbinden."
-
-#: plugins/admin/systems/servnfs.tpl:94
-msgid "Codepage"
-msgstr "Codepage"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
+msgstr "Codepage"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Option"
 msgstr "Option"
 
@@ -8472,10 +9294,12 @@ msgid "System type"
 msgstr "System-Typ"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "Betriebssystem"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8574,6 +9398,35 @@ msgstr ""
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Telefonnummer"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Telefon-Hardware"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "DTMF-Modus"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Standard IP-Adresse"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr "Hardware-Typ"
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8613,6 +9466,18 @@ msgstr "Das Feld 'Pfad' enthält ungültige Zeichen."
 msgid "Option contains invalid characters."
 msgstr "Das Feld 'Option' enthält ungültige Zeichen!"
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr "NFS"
+
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS service"
+msgstr "DNS-Dienst"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+msgid "Charset"
+msgstr "Zeichensatz"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8678,6 +9543,34 @@ msgstr ""
 "Das als REPOSITORY_HOOK '%s' angegebene Kommando lieferte eine leere "
 "Zeichenkette."
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "System-Status"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Überprüfe Parameter"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "FAI-Klassen"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr "Debian Spiegelserver"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+msgid "Debian release"
+msgstr "Debian-Release"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Erweiterte Telefon-Einstellungen"
@@ -8700,10 +9593,6 @@ msgstr "Wählen Sie das Telefon-Modell"
 msgid "refresh"
 msgstr "Aktualisieren"
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "DTMF-Modus"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8842,6 +9731,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Section"
 
@@ -8868,6 +9758,7 @@ msgstr "Drucker-Treiber"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Modell"
 
@@ -8916,6 +9807,10 @@ msgstr "Auswahl der Drucker-PPD"
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Speichern der Arbeitsstations-Dienste ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+msgid "Workstation service"
+msgstr "Arbeitsstations-Dienst"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8966,13 +9861,6 @@ msgstr "Anschluss"
 msgid "Choose mouse port"
 msgstr "Wählen Sie den Maus-Port"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Telefon-Hardware"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -9043,11 +9931,6 @@ msgstr "Bilderfassungsdienste bereitstellen"
 msgid "Boot parameters"
 msgstr "Boot-Parameter"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Boot-Kernel"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -9076,7 +9959,9 @@ msgstr "FAI-Server"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Release"
@@ -9132,10 +10017,6 @@ msgstr "Wählen, um ausführlichere Informationen während des Starts zu erhalte
 msgid "use debug mode for startup"
 msgstr "benutze Fehlersuch-Modus"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Entfernte Arbeitsfläche"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Verbindungsmethode"
@@ -9172,10 +10053,6 @@ msgstr "Auswählen, um auf dem Terminal IPP-basierte Druckdienste zu starten"
 msgid "Provide print services"
 msgstr "Druckdienste bereitstellen"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Spool-Server"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -9186,11 +10063,13 @@ msgid "Select scanner driver to use"
 msgstr "Wählen Sie den Scanner-Treiber, der benutzt werden soll"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repository"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Parent-Server"
 
@@ -9216,6 +10095,7 @@ msgstr "Kann das als REPOSITORY_HOOK angegebene Kommando '%s' nicht ausführen."
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 msgid "Repository service"
 msgstr "Repository-Dienst"
 
@@ -9250,6 +10130,14 @@ msgstr ""
 "Setzen von Status-Flag für Server Dienste/Repository mit dn '%s' "
 "fehlgeschlagen."
 
+#: plugins/admin/systems/class_servRepository.inc:441
+msgid "Releases"
+msgstr "Releases"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr "URL"
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Liste der verfügbaren Repositories."
@@ -9264,6 +10152,49 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Repository-Einstellungen zu erstellen, zu "
 "entfernen und zu bearbeiten."
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr "Inventar-Datenbank"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr "GLPI-Verwaltung"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Entfernen von Server-Dienste/GLPI mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Speichern von Server-Dienste/GLPI mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Das Attribut Datenbank ist leer oder enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+msgid "Glpi server"
+msgstr "GLPI-Server"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+msgid "Glpi server service"
+msgstr "GLPI-Dienst"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Administratoren"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "System-Typen verwalten"
@@ -9422,6 +10353,100 @@ msgstr ""
 "Kann das glpi-Konto nicht entfernen, solange die MySQL-Erweiterung für PHP "
 "fehlt."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr "GLPI"
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+msgid "Inventory extension"
+msgstr "Inventar-Erweiterung"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+msgid "Attachment name"
+msgstr "Name des Anhangs"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+msgid "Attachment comment"
+msgstr "Kommentar zum Anhang"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+msgid "Attachment mime type"
+msgstr "MIME-Typ des Anhangs"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+msgid "Attachment filename"
+msgstr "Dateiname des Anhangs"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Neuer Monitor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Gerätename"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Motherboard hinzufügen/bearbeiten"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Neue Soundkarte"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Neuer Prozessor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Neues allgemeines Gerät"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Gerätename"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Neue Festplatte"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Gerätename"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Neuer Controller"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+#, fuzzy
+msgid "Device graphics card"
+msgstr "Neue Grafikkarte"
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+#, fuzzy
+msgid "Device power supply"
+msgstr "Neues Netzteil"
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Anzeige"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Hersteller verwalten"
@@ -9460,6 +10485,7 @@ msgstr "Monitor hinzufügen/bearbeiten"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Kommentare"
@@ -9591,6 +10617,7 @@ msgid "Add/Edit network interface"
 msgstr "Netzwerk-Interface hinzufügen/bearbeiten"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -9934,6 +10961,31 @@ msgstr ""
 msgid "since"
 msgstr "seit"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Drucker-Erweiterung hinzufügen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Unterstützte Schnittstellen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Unterstützte Schnittstellen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Unterstützte Schnittstellen"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Patronen"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -10006,9 +11058,21 @@ msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr "Es sind nur Kleinbuchstaben erlaubt, bitte prüfen Sie '%ss'."
 
 #: plugins/admin/systems/class_termDNS.inc:448
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of terminal/dns account with dn '%s' failed."
-msgstr "Speichern des Mail-Kontos fehlgeschlagen"
+msgstr "Speichern von Terminal/DNS-Konto mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_termDNS.inc:511
+msgid "DNS settings"
+msgstr "DNS-Einstellungen"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+msgid "DNS records"
+msgstr "DNS-Einträge"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+msgid "IP address"
+msgstr "IP-Adresse"
 
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
@@ -10048,18 +11112,10 @@ msgstr "Regulärer Ausdruck zum Erkennen von Patronentypen"
 msgid "Reference"
 msgstr "Referenz"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Zonenname"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Zonen-Einträge"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -10077,16 +11133,6 @@ msgstr "Primärer DNS-Server für diese Zone"
 msgid "Serial number (automatically incremented)"
 msgstr "Seriennummer (automatisch inkrementiert)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Wiederholen"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Ablauf"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "MX-Einträge"
@@ -10129,7 +11175,7 @@ msgstr "Objektgruppe wählen"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr "Ab"
 
@@ -10486,64 +11532,53 @@ msgstr "Dienst, der hinzugefügt wird"
 msgid "All available services are already in use."
 msgstr "Alle verfügbaren Dienste werden bereits verwendet."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
-msgstr "Fax-Dienst"
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
+msgstr "Entfernen von Server-Dienste/CUPS mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
-msgstr "Konfiguration der Fax-Datenbank"
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
+msgstr "Speichern von Server-Dienste/CUPS mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_goFaxServer.inc:79
-#, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+#: plugins/admin/systems/class_goCupsServer.inc:122
+#, php-format
+msgid "Set status flag for server services/cups with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+#: plugins/admin/systems/class_goCupsServer.inc:206
+msgid "Cups"
+msgstr "CUPS"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:207
+msgid "Cups service"
+msgstr "CUPS-Dienst"
+
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
+msgstr "LDAP-Dienst"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:79
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Removing server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Das Attribut Benutzer ist leer oder enthält ungültige Zeichen."
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
+#: plugins/admin/systems/class_goTerminalServer.inc:102
 #, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Das Attribut Kennwort ist leer oder enthält ungültige Zeichen."
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr ""
+"Speichern von Server-Dienste/Terminal-Dienst mit dn '%s' fehlgeschlagen."
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
+#: plugins/admin/systems/class_goTerminalServer.inc:129
 #, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
 msgstr ""
-"Das als ACTION_HOOK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
 
-#: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
-msgid "LDAP service"
-msgstr "LDAP-Dienst"
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
@@ -10624,32 +11659,91 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
-msgid "Inventory database"
-msgstr "Inventar-Datenbank"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr "Beenden"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
-msgid "Glpi management"
-msgstr "GLPI-Verwaltung"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
+msgstr "Start"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
-#, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
+msgstr "Neustart"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
-#, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+"Kann den Status nicht setzen wenn der Server noch nicht gespeichert wurde."
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_serverService.inc:274
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "The specified method '%s' can't executed for services."
+msgstr "Die angegebene Methode '%s' kann nicht für Dienste ausgeführt werden."
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr "Zeit-Dienst"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
+msgstr "Zeit-Dienst"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
+msgstr "Entfernen von Server-Dienste/GOntp mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goNtpServer.inc:122
+#, php-format
+msgid "Saving server services/goNtpServer with dn '%s' failed."
+msgstr "Speichern von Server-Dienste/GOntp mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Das Attribut Datenbank ist leer oder enthält ungültige Zeichen."
+#: plugins/admin/systems/class_goNtpServer.inc:219
+msgid "NTP"
+msgstr "NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+msgid "Ntp source"
+msgstr "NTP-Quelle"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Entfernen von Server-Dienste/LDAP mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Speichern von Server-Dienste/LDAP mit dn '%s' fehlgeschlagen."
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr "Die angegebene Basis ist leer oder enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+msgid "Ldap service"
+msgstr "LDAP-Dienst"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+msgid "Ldap base"
+msgstr "LDAP-Basis"
 
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
@@ -10668,6 +11762,7 @@ msgid "This value specifies the maximal header size."
 msgstr "Dieser Wert legt die maximale Größe der Kopfzeilen fest."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr "Maximale Größe der Mailbox"
 
@@ -10676,6 +11771,7 @@ msgid "Defines the maximal size of mail box."
 msgstr "Setzt die maximale Größe der Mailbox."
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 msgid "Max message size"
 msgstr "Maximale Nachrichten-Größe"
 
@@ -10684,6 +11780,7 @@ msgid "Specify the maximal size of a message."
 msgstr "Setzt die maximale Größe einer Nachricht."
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 msgid "Relay host"
 msgstr "Relay host"
 
@@ -10692,6 +11789,7 @@ msgid "Relay messages to following host:"
 msgstr "Leite Nachrichten zu folgendem Host:"
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr "Lokale Netzwerke"
 
@@ -10704,6 +11802,7 @@ msgid "Domains and routing"
 msgstr "Domänen und Weiterleitung"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr "Domänen, für die Mail angenommen wird"
 
@@ -10724,6 +11823,7 @@ msgid "Restrictions"
 msgstr "Einschränkungen"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr "Einschränkungen für den Sender"
 
@@ -10733,6 +11833,7 @@ msgid "Restriction filter"
 msgstr "Einschränkungsmuster"
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr "Einschränkungen für Empfänger"
 
@@ -10760,168 +11861,67 @@ msgstr "Setze neuen Status"
 msgid "Set status"
 msgstr "Status setzen"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr "Beenden"
-
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
-msgstr "Start"
-
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
-msgstr "Neustart"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-"Kann den Status nicht setzen wenn der Server noch nicht gespeichert wurde."
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr "Die angegebene Methode '%s' kann nicht für Dienste ausgeführt werden."
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Terminal-Dienst"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 msgid "Start IMAP service"
 msgstr "IMAP-Dienst starten"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 msgid "Start IMAP SSL service"
 msgstr "IMAP/SSL-Dienst starten"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 msgid "Start POP3 service"
 msgstr "POP3-Dienst starten"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 msgid "Start POP3 SSL service"
 msgstr "POP3/SSL-Dienst starten"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
-msgstr "Zeit-Dienst"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-msgid "NTP service"
-msgstr "Zeit-Dienst"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-msgid "The given base is empty or contains invalid characters."
-msgstr "Die angegebene Basis ist leer oder enthält ungültige Zeichen."
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 msgid "Logging service"
 msgstr "Protokoll-Dienst"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 msgid "Syslog service"
 msgstr "Protokoll-Dienst"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:76
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/goSysLog with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/GOsyslog mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goSyslogServer.inc:94
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/goSysLog with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/GOsyslog mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goSyslogServer.inc:121
 #, php-format
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "enabled"
-msgstr "aktiviert"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+msgid "Syslog"
+msgstr "Systemprotokoll"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 msgid "VoIP service"
 msgstr "VoIP-Dienst"
 
 #: plugins/admin/systems/class_goFonServer.inc:82
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/gofon with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/GOfon mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goFonServer.inc:100
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/gofon with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/GOfon mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goFonServer.inc:127
 #, php-format
@@ -10945,26 +11945,52 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Das Attribut Landesvorwahl ist leer oder enthält ungültige Zeichen."
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+msgid "GoFon server"
+msgstr "GOfon-Server"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+msgid "GoFon server service"
+msgstr "GOfon-Dienst"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+msgid "Area code"
+msgstr "Ortsvorwahl"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+msgid "Country code"
+msgstr "Landesvorwahl"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/GOlogDB mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goLogDBServer.inc:97
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/goLogDB with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/GOlogDB mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goLogDBServer.inc:124
 #, php-format
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "Informationen der GLPI-Datenbank"
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+msgid "Log"
+msgstr "Protokoll"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+msgid "Log service"
+msgstr "Protokoll-Dienst"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
+msgstr "aktiviert"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 msgid "Kerberos service"
 msgstr "Kerberos-Dienst"
 
@@ -10973,14 +11999,14 @@ msgid "Kerberos kadmin access informations"
 msgstr "Informationen zum Kerberos KAdmin-Zugang"
 
 #: plugins/admin/systems/class_goKrbServer.inc:79
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/gokrb with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/GOkrb mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goKrbServer.inc:97
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/gokrb with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/GOkrb mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goKrbServer.inc:124
 #, php-format
@@ -11002,9 +12028,9 @@ msgstr "Der angebene Kerberos-Administrator ist leer."
 msgid "The specified kerberos realm is empty."
 msgstr "Die angebene Kerberos-Realm ist leer."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Informationen der Fax-Datenbank"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+msgid "Realm"
+msgstr "Realm"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 msgid "Mail service (SMTP)"
@@ -11015,14 +12041,14 @@ msgid "Postfix"
 msgstr "Postfix"
 
 #: plugins/admin/systems/class_goMailServer.inc:512
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/mail with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/Mail mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goMailServer.inc:580
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/mail with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/Mail mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goMailServer.inc:608
 #, php-format
@@ -11047,6 +12073,22 @@ msgstr ""
 "Bitte geben Sie einen numerischen Wert für die Maximale Nachrichten-Größe "
 "ein."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+msgid "Mail service"
+msgstr "Mail-Dienst"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+msgid "Transport table"
+msgstr "Transport-Tabelle"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "Informationen der GLPI-Datenbank"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr "IMAP/POP3-Dienst"
@@ -11060,14 +12102,14 @@ msgid "Cyrus service"
 msgstr "Cyrus-Dienst"
 
 #: plugins/admin/systems/class_goImapServer.inc:112
-#, fuzzy, php-format
+#, php-format
 msgid "Removing server services/imap with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Entfernen von Server-Dienste/IMAP mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goImapServer.inc:130
-#, fuzzy, php-format
+#, php-format
 msgid "Saving server services/imap with dn '%s' failed."
-msgstr "Speichern des Server-Dienste Objektes ist fehlgeschlagen"
+msgstr "Speichern von Server-Dienste/IMAP mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goImapServer.inc:158
 #, php-format
@@ -11099,9 +12141,22 @@ msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
 msgid "The sieve port needs to be numeric."
 msgstr "Der Sieve-Port muss numerisch sein."
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Informationen der Protokoll-Datenbank"
+#: plugins/admin/systems/class_goImapServer.inc:273
+msgid "Imap"
+msgstr "IMAP"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+msgid "Imap service"
+msgstr "IMAP-Dienst"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Administrator-Passwort:"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Informationen der Fax-Datenbank"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 msgid "File service"
@@ -11113,9 +12168,9 @@ msgid "Removing of system server/shares with dn '%s' failed."
 msgstr "Entfernen von System Server/Freigaben mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goShareServer.inc:212
-#, fuzzy, php-format
+#, php-format
 msgid "Saving of system server/shares with dn '%s' failed."
-msgstr "Speichern der Server-Datenbank Einstellungen ist fehlgeschlagen"
+msgstr "Speichern von System Server/Freigabe mit dn '%s' fehlgeschlagen."
 
 #: plugins/admin/systems/class_goShareServer.inc:239
 #, php-format
@@ -11125,9 +12180,11 @@ msgstr ""
 "fehlgeschlagen."
 
 #: plugins/admin/systems/class_goShareServer.inc:287
-#, fuzzy, php-format
+#, php-format
 msgid "Creating system server/shares (mount container) with dn '%s' failed."
-msgstr "Erstellen des Mount-Containers ist fehlgeschlagen"
+msgstr ""
+"Erstellen von System Server/Freigabe (Mount-Container) mit dn '%s' "
+"fehlgeschlagen."
 
 #: plugins/admin/systems/class_goShareServer.inc:301
 #, fuzzy, php-format
@@ -11139,6 +12196,18 @@ msgstr "Entfernen des Mount-Containers ist fehlgeschlagen"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Speichern des Mount-Containers ist fehlgeschlagen"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+msgid "Share service"
+msgstr "Freigabe-Dienst"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+msgid "Share entry"
+msgstr "Freigabe-Eintrag"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr "Informationen der Protokoll-Datenbank"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11163,6 +12232,7 @@ msgid "Phone queue"
 msgstr "Warteschlange"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "System"
 
@@ -11179,6 +12249,11 @@ msgstr "Es muss mindestens ein NTP-Server ausgewählt sein."
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "Entfernen der Maileinstellungen der Objektgruppe ist fehlgeschlagen"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "System-Status"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Zeige Abteilungen"
@@ -11236,6 +12311,7 @@ msgid "Display objects of department"
 msgstr "Zeige die Objekte der Abteilung"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Objektgruppen"
@@ -11321,6 +12397,16 @@ msgstr "Speichern des Gruppenobjektes fehlgeschlagen"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Entfernen der Objektgruppe ist fehlgeschlagen"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Objektgruppe"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Mitglieder"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11347,6 +12433,7 @@ msgid "Generic queue Settings"
 msgstr "Allgemeine Warteschlangen-Einstellungen"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Wartezeit"
 
@@ -11375,6 +12462,7 @@ msgid "Use music on hold instead of ringing"
 msgstr "Benutze Wartemusik statt Klingelton"
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr "Wartemusik"
 
@@ -11423,26 +12511,32 @@ msgid "Phone attributes "
 msgstr "Telefon-Attribute"
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr "Benachrichtige über Wartezeit"
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr "Erlaube Weiterleiten des Gesprächs (Angerufener)"
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr "Erlaube Weiterleiten des Gesprächs (Anrufer)"
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Angerufener)"
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Anrufer)"
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr "Klingelton statt Hintergrund-Musik"
 
@@ -11478,6 +12572,11 @@ msgstr "Speichern des Gruppenobjektes fehlgeschlagen"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Entfernen der Objektgruppe ist fehlgeschlagen"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "MIME-Gruppe"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "alle gleichzeitig"
@@ -11615,6 +12714,75 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "Entfernen der Maileinstellungen der Objektgruppe ist fehlgeschlagen"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Mitglieder sind in einer Telefon-Gruppe"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Maximale Grösse der Warteschlange"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Benachrichtigungsfrequenz"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Willkommen %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+#, fuzzy
+msgid "Report hold time"
+msgstr "Benachrichtige über Wartezeit"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+#, fuzzy
+msgid "'There are' sound"
+msgstr "'Es gibt ...'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+#, fuzzy
+msgid "'Call waiting' sound"
+msgstr "'... wartende Anrufe'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "'Vielen Dank'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "'Minuten'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Second' sound"
+msgstr "'Sekunden'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "'Weniger als...''"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Telefonnummer"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Benachrichtigung"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11716,9 +12884,8 @@ msgid "Object group"
 msgstr "Objektgruppe"
 
 #: plugins/admin/acl/class_aclManagement.inc:25
-#, fuzzy
 msgid "ACLs"
-msgstr "Zugriffsregeln"
+msgstr "ACLs"
 
 #: plugins/admin/acl/class_aclManagement.inc:159
 #, fuzzy, php-format
@@ -11737,9 +12904,8 @@ msgid "List of acl"
 msgstr "Liste der Makros"
 
 #: plugins/admin/acl/class_divListACL.inc:32
-#, fuzzy
 msgid "List of acls"
-msgstr "Liste der Makros"
+msgstr "Liste der ACLs"
 
 #: plugins/admin/acl/class_divListACL.inc:36
 #, fuzzy
@@ -11749,14 +12915,12 @@ msgstr ""
 "bearbeiten."
 
 #: plugins/admin/acl/class_divListACL.inc:61
-#, fuzzy
 msgid "Display acls matching"
-msgstr "Zeige Makros, auf die zutrifft"
+msgstr "Zeige ACLs, auf die zutrifft"
 
 #: plugins/admin/acl/class_divListACL.inc:109
-#, fuzzy
 msgid "Acl"
-msgstr "Alle"
+msgstr "ACL"
 
 #: plugins/admin/acl/class_divListACL.inc:153
 #, fuzzy
@@ -11779,9 +12943,8 @@ msgid "Display departments"
 msgstr "Zeige Abteilungen, auf die zutrifft"
 
 #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
-#, fuzzy
 msgid "ACL management"
-msgstr "GLPI-Verwaltung"
+msgstr "ACL-Verwaltung"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
@@ -11808,12 +12971,44 @@ msgstr "Automatische Installation"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Erzeugen der Basis für FAI-Skripte ist fehlgeschlagen"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+msgid "FAI script"
+msgstr "FAI-Skript"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Anmeldeskript"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Speichern der FAI-Vorlage ist fehlgeschlagen"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+msgid "FAI template"
+msgstr "FAI-Vorlage"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+msgid "Template file"
+msgstr "Vorlagen-Datei"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+msgid "Template path"
+msgstr "Vorlagen-Pfad"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+msgid "File owner"
+msgstr "Datei-Besitzer"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+msgid "File permissions"
+msgstr "Datei-Berechtigungen"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11851,6 +13046,15 @@ msgstr "Der angegebene Zweigname ist ungültig."
 msgid "Specified freeze name is invalid."
 msgstr "Der angegebene \"Freeze\"-Name ist ungültig."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Verwaltung"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+msgid "FAI management"
+msgstr "FAI-Verwaltung"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Installations-Methode"
@@ -11985,88 +13189,121 @@ msgstr "Paket '%s' existiert nicht."
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Speichern der FAI-Paket-Basis fehlgeschlagen"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paket"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+msgid "FAI Package list"
+msgstr "FAI-Paketliste"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+msgid "Install Method"
+msgstr "Installations-Methode"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr "Diese Liste zeigt alle diesem Profil zugeordneten Klassen-Namen."
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Hook-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Vorlagen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Skript-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Variablen-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr "Paket-Gruppe"
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr "Entferne Klasse von Profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr "Bitte ordnen Sie diesem Profil mindestens eine Klasse zu."
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Bitte geben Sie einen gültigen Namen ein."
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr ""
 "Der von Ihnen angegebene Klassen-Name ist bereits für ein Profil vergeben."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Speichern des FAI-Profils fehlgeschlagen"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Profile"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+msgid "FAI profile"
+msgstr "FAI-Profil"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Erzeugen der Basis für FAI-Hooks ist fehlgeschlagen"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "FAI-Klassen"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "Hooks"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiHook.inc:475
 #, fuzzy
+msgid "FAI hook"
+msgstr "Zeige FAI-Hooks"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Aufgabe"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 msgid "primary"
-msgstr "Primäre Gruppe"
+msgstr "primär"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
-#, fuzzy
 msgid "logical"
-msgstr "Lokale hinzufügen"
+msgstr "logisch"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr "Dateisystem"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Mount-Punkt"
@@ -12077,6 +13314,7 @@ msgid "Size in MB"
 msgstr "Größe in MB"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Mount-Optionen"
@@ -12166,6 +13404,7 @@ msgid "Variable attributes"
 msgstr "Variablen-Attribute"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Variablen-Inhalt"
 
@@ -12203,6 +13442,35 @@ msgstr "%s Partition(en)"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Speichern des FAI-Partitionstabellen-Eintrags fehlgeschlagen"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+msgid "FAI partition table"
+msgstr "FAI-Partitionstabelle"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+msgid "Partition type"
+msgstr "Partitionstyp"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+msgid "Partition no."
+msgstr "Partitionsnummer"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+msgid "File system type"
+msgstr "Dateisystem-Typ"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+msgid "Partition size"
+msgstr "Partitionsgröße"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+msgid "File system options"
+msgstr "Dateisystem-Optionen"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partitionen"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Bitte geben Sie einen Wert für 'Skript' ein."
@@ -12220,10 +13488,6 @@ msgstr "Klassen-Name"
 msgid "Hook attributes"
 msgstr "Hook-Attribute"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Aufgabe"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr "Einen existierenden Task wählen"
@@ -12313,6 +13577,11 @@ msgstr "Ein neuer Klassen-Name."
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Speichern der FAI-Variablen-Basis fehlgeschlagen"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Zeige FAI-Variablen"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "Es wurden noch keine Datei hochgeladen."
@@ -12360,6 +13629,7 @@ msgid "Destination path"
 msgstr "Ziel-Pfad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Besitzer"
@@ -12426,10 +13696,6 @@ msgstr ""
 "Dieses Menü erlaubt es Ihnen, Pakete auszuwählen und zur gegenwärtig "
 "bearbeiteten Paketliste hinzuzufügen."
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paket"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12705,7 +13971,6 @@ msgstr "Klasse entfernen"
 #: plugins/admin/mimetypes/generic.tpl:13
 #: plugins/admin/mimetypes/paste_generic.tpl:13
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:148
-#, fuzzy
 msgid "Mime type"
 msgstr "MIME-Typ"
 
@@ -12716,9 +13981,9 @@ msgid "Please enter a name for the mime type here"
 msgstr "Bitte geben Sie einen Namen für die Konferenz ein."
 
 #: plugins/admin/mimetypes/generic.tpl:21
-#, fuzzy
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 msgid "Mime group"
-msgstr "Primäre Gruppe"
+msgstr "MIME-Gruppe"
 
 #: plugins/admin/mimetypes/generic.tpl:24
 #, fuzzy
@@ -12739,6 +14004,7 @@ msgid "Left click"
 msgstr "Linksklick"
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filter"
@@ -12822,10 +14088,26 @@ msgstr ""
 "Sie haben keine Berechtigung, einen MIME-Typ unterhalb dieser 'Basis' "
 "anzulegen."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "MIME-Typ Name"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr "MIME-Typen"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Linksklick"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Verwendete Anwendungen"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 msgid "Manage mime types"
 msgstr "MIME-Typen verwalten"
@@ -13041,6 +14323,37 @@ msgstr "Benutzer '%s' von Warteschlange '%s' entfernt."
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Entfernen des Telefon-Kontos ist fehlgeschlagen"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Telefon-Einstellungen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Auslieferungsmethode"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Telefon"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#, fuzzy
+msgid "Voivemail pin"
+msgstr "Voicemail-PIN"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Telefonnummer"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Mail-Einstellungen"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13195,6 +14508,20 @@ msgstr "Bitte wählen Sie eine gültige Basis."
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Speichern des oxchange-Adressbuchs fehlgeschlagen"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Asterisk Verwaltung"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Makro-Inhalt"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr "Argument"
@@ -13317,6 +14644,7 @@ msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
@@ -13326,6 +14654,7 @@ msgid "PIN"
 msgstr "PIN"
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
@@ -13334,6 +14663,7 @@ msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
@@ -13350,13 +14680,10 @@ msgid "Count users"
 msgstr "Zähle Benutzer"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Telefon-Konferenzen"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Verwaltung"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13400,6 +14727,50 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Konferenz-Verwaltung"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr "GOfon"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Konferenz"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Sitzungsmenü aktivieren"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#, fuzzy
+msgid "Announce user activity"
+msgstr "Benachrichtigungsfrequenz"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Zähle Benutzer"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Konferenz-Name"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "Format"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#, fuzzy
+msgid "Lifetime"
+msgstr "Lebenszeit (in Tagen)"
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "Konferenz-Verwaltung"
@@ -13441,6 +14812,9 @@ msgid "Duration"
 msgstr "Dauer"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Telefon-Berichte"
 
@@ -13848,7 +15222,7 @@ msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 msgid "References"
 msgstr "Referenzen"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -13856,7 +15230,7 @@ msgstr ""
 "Das in CHECK angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -13864,7 +15238,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -13872,7 +15246,7 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -13880,38 +15254,38 @@ msgstr ""
 "Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Objekt '%s' ist bereits markiert"
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, fuzzy, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr "Die Bearbeitung der Objekt-Markierung ist fehlgeschlagen"
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Entferne Markierung von Objekt '%s'"
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Speichern des Gruppenobjektes fehlgeschlagen"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "Sie haben keine Berechtigung, diesen Eintrag zu löschen!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -13920,7 +15294,7 @@ msgstr ""
 "Die Abbild-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
 "s' ist nicht in ihrer gosa.conf konfiguriert."
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
@@ -13929,17 +15303,17 @@ msgstr ""
 "Die Abbild-Funktionalität ist aktiviert, aber die erforderliche(n) Variable"
 "(n) '%s' ist/sind nicht in ihrer gosa.conf konfiguriert."
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Wiederherstellen des Abbilds fehlgeschlagen."
@@ -13948,7 +15322,7 @@ msgstr "Wiederherstellen des Abbilds fehlgeschlagen."
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr "Kann SSHA nicht benutzen (Fehlende Funktion mhash / sha1)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -13956,12 +15330,12 @@ msgstr ""
 "Die Konfigurationsdatei gosa.conf hat sich teilweise geändert. Bitte "
 "konvertieren Sie diese mit dem beigefügten Skript fix_config.sh!"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -14041,7 +15415,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann den LDAP-Server nicht erreichen. Bitte benachrichtigen Sie den "
@@ -14613,7 +15987,7 @@ msgstr ""
 "Die Anmeldung am LDAP-Server ist fehlgeschlagen. Die Meldung lautet '%s'."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14736,112 +16110,112 @@ msgstr ""
 msgid "Access control"
 msgstr "Zugriffsoptionen"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr "ACLs zurücksetzen"
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Priorität"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Erstelle neues FAI-Objekt"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Ignoriere Unterbäume"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr "Vollständiger Teilbaum (permanent)"
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 msgid "Edit ACL"
 msgstr "ACL Bearbeiten"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 msgid "Delete ACL"
 msgstr "ACL Entfernen"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr "Keine ACL-Einstellungen für diese Kategorie"
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Enthält ACLs für diese Objekte: %s"
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 msgid "Edit categories ACLs"
 msgstr "ACLs dieser Kategorie bearbeiten"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr "ACLs dieser Kategorie leeren"
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr "Änderbar vom Eigentümer"
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 msgid "Move object"
 msgstr "Objekt verschieben"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 msgid "Remove object"
 msgstr "Objekt entfernen"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr "Unbekannter ACL-Typ '%s'. Verarbeitung nicht möglich."
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Unbekannter Eintrag '%s'!"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 msgid "Members:"
 msgstr "Mitglieder:"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 #, fuzzy
 msgid "ACL is valid for all users"
 msgstr "ACL ist gültig für alle Benutzer"
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Speichern der ACLs von dn '%s' fehlgeschlagen."
@@ -14945,27 +16319,27 @@ msgstr "Kann Datei '%s' nicht öffnen, möglicherweise existiert sie nicht."
 msgid "Can't read file '%s', check permissions."
 msgstr "Kann Datei '%s' nicht lesen, überprüfen Sie die Rechte."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "Die Konfigurationsdatei %s/gosa.conf ist nicht lesbar. Abgebrochen."
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -14973,30 +16347,30 @@ msgstr ""
 "GOsa kann keine Informationen über die verfügbaren Schema-Definitionen "
 "anfordern. Bitte stellen Sie sicher, dass dies möglich ist."
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Ihr LDAP-Server enthält veraltete Schema-Definitionen. Bitte führen Sie "
 "erneut die Einrichtung durch."
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15327,10 +16701,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "Administrator-DN:"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Administrator-Passwort:"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15608,6 +16978,9 @@ msgid ""
 "This procedure will restore a snapshot of the selected object. It will "
 "replace the existing object after pressing the restore button."
 msgstr ""
+"Dieser Vorgang stellt ein Abbild des gewählten Objekts wieder her. Er wird "
+"dabei das vorhandene überschreiben, nachdem Sie den Wiederherstellen-Knopf "
+"gedrückt haben."
 
 #: ihtml/themes/default/snapshotdialog.tpl:23
 #, fuzzy
@@ -15631,6 +17004,9 @@ msgid ""
 "stored inside a special branch of your directory system and can be restored "
 "later on."
 msgstr ""
+"Dieser Vorgang wird ein Abbild des gewählten Objekts erzeugen. Es wird "
+"innerhalb eines speziellen Zweiges Ihres Verzeichnisses gespeichert und kann "
+"später wieder hergestellt werden."
 
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Timestamp"
@@ -15641,9 +17017,36 @@ msgstr "Zeitstempel"
 msgid "Reason for generating this snapshot"
 msgstr "Stelle einen Objekt-Abzug wieder her"
 
+#~ msgid "Day"
+#~ msgstr "Tag"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Wählen Sie das Tastatur-Modell"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Wählen Sie die Tastatur-Variante"
+
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Kontingent-Größe"
+#~ msgid "Valume"
+#~ msgstr "Volume"
+
+#, fuzzy
+#~ msgid "Technical responsilbe"
+#~ msgstr "Technischer Kontakt"
+
+#~ msgid "Server indentifier"
+#~ msgstr "Serverbezeichnung"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr ""
+#~ "Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
+#~ "anzulegen."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Standard-Zertifikat"
 
 #, fuzzy
 #~ msgid "Vocation message"
@@ -15876,9 +17279,6 @@ msgstr "Stelle einen Objekt-Abzug wieder her"
 #~ "Dieser Server besitzt aktivierte Kolab-Funtionen. Sie können diese durch "
 #~ "einen Klick auf die Schaltfläche unten deaktivieren."
 
-#~ msgid "Add Kolab service"
-#~ msgstr "Kolab-Dienst hinzufügen"
-
 #~ msgid ""
 #~ "This server has kolab features disabled. You can enable them by clicking "
 #~ "below."

diff --git a/locale/es/LC_MESSAGES/messages.mo b/locale/es/LC_MESSAGES/messages.mo
index 41d4cec3a01f372b48f72fb1548e23d31741453c..c694e74644be43648c533e3003192be7f66942ec 100644 (file)
Binary files a/locale/es/LC_MESSAGES/messages.mo and b/locale/es/LC_MESSAGES/messages.mo differ

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index fcceca22fc035bffa5d5767f7f189e9447bc439c..f4a67808346d0acbe63ad23847ee97149cb4697b 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,13 +1,15 @@
 # translation of messages.po to Español
 # Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
 # Alejandro Escanero Blanco <thoth@bbvnet.com>, 2006.
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2006-06-10 19:06GMT\n"
 "Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
 "Language-Team: Español\n"
@@ -16,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -25,6 +27,7 @@ msgid "Administration"
 msgstr "Administradores"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Agregados"
 
@@ -36,18 +39,29 @@ msgstr "Agregados"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -57,7 +71,9 @@ msgstr "Agregados"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
@@ -68,6 +84,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -75,16 +92,21 @@ msgstr "Entorno"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -99,23 +121,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -127,16 +154,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Teléfono"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -160,6 +190,8 @@ msgid "Parameter"
 msgstr "Parámetro"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Inicio"
@@ -171,8 +203,9 @@ msgstr "Servicios"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -242,6 +275,7 @@ msgstr "Paticiones"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -269,7 +303,7 @@ msgstr "Perfiles"
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Paquetes"
 
@@ -384,7 +418,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -430,12 +464,12 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -491,9 +525,9 @@ msgstr "Añadir"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -517,8 +551,8 @@ msgstr "Añadir"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -529,8 +563,8 @@ msgstr "Añadir"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -564,6 +598,7 @@ msgstr "Cuenta Principal"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -587,8 +622,9 @@ msgid "not defined"
 msgstr "sin definirse"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
@@ -708,14 +744,14 @@ msgstr "rechazar correos mayores que"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
@@ -747,7 +783,7 @@ msgstr ""
 "El usuario solo esta permitido a enviar y recibir correo de forma local"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
@@ -767,7 +803,7 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -816,7 +852,7 @@ msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Parámetros de correo"
@@ -871,27 +907,27 @@ msgstr "Esto hace algo"
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "No se pueden conseguir los datos de la cuota de '%s'."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -900,13 +936,13 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -915,22 +951,22 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
 "sentido."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -939,35 +975,35 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "No se ha podido borrar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "No se ha podido guardar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
@@ -975,99 +1011,104 @@ msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
 "rechazar mensajes."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Cuenta Principal"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Último envío"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Información organizativa"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
 msgid "Spam level"
 msgstr "Nivel de log"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
@@ -1154,10 +1195,15 @@ msgstr "Atras"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1215,8 +1261,8 @@ msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1224,16 +1270,17 @@ msgid "Home directory"
 msgstr "Directorio Principal"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Grupo primario"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1253,6 +1300,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1271,7 +1319,7 @@ msgid "Account"
 msgstr "Cuenta"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Autenticación del sistema"
 
@@ -1658,54 +1706,54 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "Cuenta GLPI"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Mostrar paquetes"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostrar personal"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Autenticación del sistema"
@@ -1737,7 +1785,7 @@ msgid "Allow user to change password from client"
 msgstr "Permitir al usuario cambiar las opciones desde el cliente"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en window no requiere contraseña"
 
@@ -1746,7 +1794,7 @@ msgid "Temporary disable samba account"
 msgstr "Desactivar temporalmente la cuenta samba"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Dominio"
 
@@ -1755,12 +1803,12 @@ msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Permitir entrada en el servidor de terminal"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Configuración del cliente por defecto"
 
@@ -1825,17 +1873,17 @@ msgid "Reconnect if disconnected"
 msgstr "Reconexión si se ha desconectado"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Tiempo de entrada límite"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Tiempo de salida límite"
 
@@ -1848,7 +1896,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
@@ -1977,41 +2025,41 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "La cuenta expirará después de"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Permitir al usuario cambiar las opciones desde el cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "La contraseña expira en"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Directorio Principal"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
@@ -2054,57 +2102,53 @@ msgstr ""
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Cuenta proxy"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr "No se puede añadir el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "No tiene permisos para crear un usuario en esta 'Base'."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "No tiene permisos para transladar a un usuario de su base original"
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2112,7 +2156,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2120,110 +2164,110 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "El campo 'Pagina web principal' contiene un URL no valida"
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "El campo 'Fax' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 "El campo 'Dispositivo de Búsqueda' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "¡No puedo abrir el certificado especificado!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Intereses"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Último envío"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Población de la Persona"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Adjunto al area"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Título Funcional"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Papel desempeñado"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2234,70 +2278,112 @@ msgstr "Código Postal"
 msgid "Generic user settings"
 msgstr "Parámetros genéricos de la cola"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Base"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Borrar contraseña"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 #, fuzzy
 msgid "Surename"
 msgstr "Nombre del servidor"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Información de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Títulos academicos"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Página Web Principal"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2310,189 +2396,161 @@ msgstr "Organización"
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Remitente"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Nombre del departamento"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Foto del usuario"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "Teléfono particular"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 #, fuzzy
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Número de serie"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Certificado estandar"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Foto Personal"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Cambiar foto"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Apellidos"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2516,67 +2574,69 @@ msgstr "Elija el subárbol donde colocar el usuario"
 msgid "Select a base"
 msgstr "Seleccione una base"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Numero privado"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Información organizativa"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Departamento No."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Empleado No."
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Habitación No."
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2584,7 +2644,7 @@ msgstr "Teléfono Móvil"
 msgid "Pager"
 msgstr "Paginador"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Por favor use la casilla teléfono"
 
@@ -2622,8 +2682,8 @@ msgstr "Eliminar foto"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2652,7 +2712,7 @@ msgstr "Certificado estandar"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2686,10 +2746,6 @@ msgstr "Numero de serie del certificado"
 msgid "User settings"
 msgstr "Parámetros del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Foto del usuario"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Borrar contraseña"
@@ -2753,6 +2809,7 @@ msgid "Temporary disable FTP access"
 msgstr "Acceso FTP desactivado temporalmente"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Cuenta proxy"
 
@@ -2765,6 +2822,7 @@ msgid "Limit proxy access to working time"
 msgstr "Limitar acceso al proxy al horario laboral"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir el uso del proxy con cuota"
 
@@ -2776,16 +2834,39 @@ msgstr "por"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Parámetros de grupo"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "La cuenta expirará después de"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Cuenta"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
@@ -2804,6 +2885,7 @@ msgstr ""
 "modificadas si añade una cuenta de correo."
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr "Delegaciones"
 
@@ -2839,17 +2921,19 @@ msgid "Invitation policy"
 msgstr "Política de invitación"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2857,125 +2941,187 @@ msgstr ""
 "La dirección de correo primaria que esta intentando añadir, ya esta usada "
 "por otro usuario"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Cuenta Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Parámetros de correo"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Información de estado de presencia"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la cuenta WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Ha fallado al guardar la cuenta WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "El valor especificado como 'relación' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Cuenta Open-Xchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "Tipo de FS"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
-"desactivado, No se ha detectado soporte Postgresql, o la base de datos "
-"especificada no puede ser alcanzada"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Crear cuenta de fax"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Enviar"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Descargar configuración"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Ancho de banda ascendente"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Ancho de banda descendente"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Cuenta Open-Xchange"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+"desactivado, No se ha detectado soporte Postgresql, o la base de datos "
+"especificada no puede ser alcanzada"
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -3005,49 +3151,79 @@ msgstr "Zona de uso horario del usuario"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr "No puedo conectar al servidor de base de datos postgresql."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "¡Los parámetros necesarios para extensión de conectividad open-xchange no se "
 "encuentran!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql no está instalado!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Cuenta de Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Días de recordatorio"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Días para tareas"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "desactivado"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Zona de uso horario del usuario"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Crear cuenta de intranet"
@@ -3056,94 +3232,145 @@ msgstr "Crear cuenta de intranet"
 msgid "This account has no connectivity extensions."
 msgstr "Esta cuenta no tiene extensiones de conectividad"
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Conectividad"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Conectividad"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Se ha fallado al eliminar la cuenta del proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor numérico para cuota no es valido."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta proxy"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Limitar acceso al proxy al horario laboral"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Cuota del Perfil"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Periodo de Notificación de Host"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "Cuenta PPTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de intranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta de intranet"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Crear cuenta de intranet"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Crear cuenta de intranet"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "Cuenta GLPI"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta PPTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr "Cuenta OpenGroupware"
 
@@ -3167,6 +3394,7 @@ msgid "Teams"
 msgstr "Equipos"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr "Cuenta PHPschedulñeit"
 
@@ -3174,38 +3402,58 @@ msgstr "Cuenta PHPschedulñeit"
 msgid "PHPscheduleit"
 msgstr "PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta PHPscheduleit"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPscheduleit"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Cuenta OpenGroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Cuenta OpenGroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Cuenta OpenGroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -3237,7 +3485,7 @@ msgid "Profil quota"
 msgstr "Cuota del Perfil"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr ""
 
@@ -3246,7 +3494,7 @@ msgid "Kiosk profile settings"
 msgstr "Parámetros del perfil de Kiosk"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr ""
 
@@ -3255,24 +3503,26 @@ msgid "Manage"
 msgstr "Gestionar"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Resolución"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Recursos compartidos"
 
@@ -3512,26 +3762,30 @@ msgid "Administrator"
 msgstr "Administrador"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Servidor de Archivos"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3576,28 +3830,51 @@ msgstr "Nombre del Script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3633,7 +3910,7 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3728,30 +4005,37 @@ msgid "Nagios Account"
 msgstr "Cuenta Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Periodo de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Periodo de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Opciones de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Opciones de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Comandos de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Comandos de Notificación de Host"
 
@@ -3840,6 +4124,46 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Ha fallado borrar cuenta de nagios"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Parámetros de Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Ver la información de sistema"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Ver la información de configuración"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Ver la información de sistema"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Parámetros de Nagios"
@@ -3895,12 +4219,26 @@ msgstr "Ha fallado la grabación de la cuenta Netatalk"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta Netatalk"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Directorio Principal"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Compartido"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr ""
 
@@ -3918,13 +4256,16 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3948,7 +4289,47 @@ msgstr "Números bloqueados"
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Aviso"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
+"manera de que GOsa recupere posteriormente la información."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Gestión de listas de bloqueo"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
@@ -3978,70 +4359,95 @@ msgstr "recibir"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la estación de trabajo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Ha fallado la grabación de la estación de trabajo"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
-"manera de que GOsa recupere posteriormente la información."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
-"<i>Cancelar</i> para Abortar."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Nombre"
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Gestión de listas de bloqueo"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+#, fuzzy
+msgid "Blocklist type"
+msgstr "N0mbre de listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4180,12 +4586,12 @@ msgstr "Subir un departamento"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr ""
 
@@ -4319,7 +4725,7 @@ msgstr "Enviar departamentos"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "Editar"
 
@@ -4346,7 +4752,7 @@ msgstr "Editar usuario"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "borrar"
 
@@ -4361,7 +4767,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Lenguaje"
@@ -4373,6 +4781,7 @@ msgstr ""
 "correo"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato de envío"
 
@@ -4397,6 +4806,7 @@ msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrónico"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -4536,6 +4946,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta proxy"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Parametros de samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Mostrar listas de bloqueos salientes"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4698,39 +5127,16 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Nombre"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Reportes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Dispositivos instalados"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4858,7 +5264,7 @@ msgstr "Ciudad"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Pais"
 
@@ -5570,7 +5976,8 @@ msgid "Notifications"
 msgstr "Intereses"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Grupos"
@@ -5653,12 +6060,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5790,6 +6197,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Parámetros genéricos de la cola"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Cuenta Nagios"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Miembros del grupo"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Enfocado a la versión"
@@ -5810,7 +6247,8 @@ msgstr "Añadir categoría"
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "leer"
 
@@ -5826,7 +6264,8 @@ msgstr "post externo"
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "escribir"
 
@@ -5867,6 +6306,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Por favor seleccione un servidor de correo valido."
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Direcciones alternativas"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Cuenta Principal"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Permisos"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Administradores de Carpetas"
@@ -5958,18 +6418,6 @@ msgstr "Mostrar usuarios del departamento"
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
@@ -6078,6 +6526,40 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Mostrar aplicaciones"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplicación"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Parámetros de grupo"
@@ -6162,14 +6644,6 @@ msgstr "Crear nuevo grupo"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplicación"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6284,6 +6758,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Plantilla"
 
@@ -6442,7 +6917,9 @@ msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Nombre mostrado"
 
@@ -6453,6 +6930,7 @@ msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6472,7 +6950,9 @@ msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icono"
 
@@ -6486,22 +6966,27 @@ msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrada en los barra de inicio de los miembros"
 
@@ -6540,6 +7025,7 @@ msgstr ""
 "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variable"
 
@@ -6644,6 +7130,20 @@ msgstr "Ha fallado la grabación de la aplicación"
 msgid "Application settings"
 msgstr "Parámetros de aplicaciones"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Contenido de la Variable"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6708,6 +7208,7 @@ msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Categoría"
 
@@ -6741,6 +7242,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Parámetros administrativos"
 
@@ -6749,10 +7251,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -6802,25 +7304,25 @@ msgstr ""
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Ha fallado la eliminación del departamento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "No tiene permisos para crear un departamento en esta 'Base'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -6828,45 +7330,59 @@ msgstr ""
 "El campo 'Nombre' contiene la palabra reservada '%s'. Por favor elija otro "
 "nombre."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Ha fallado la grabación del departamento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Objeto"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Departamentos"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nombre del departamento"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6882,20 +7398,6 @@ msgstr "No tiene permisos para eliminar este departamento."
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Nombre del departamento"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6946,6 +7448,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6958,6 +7461,8 @@ msgstr "Zona"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7026,11 +7531,14 @@ msgid "Terminal Service"
 msgstr "Servidor de terminal"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Desactivación temporal del acceso"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Ruta a las fuentes tipográficas"
@@ -7198,8 +7706,11 @@ msgstr "Elija un subárbol donde colocar el terminal"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Modo"
 
@@ -7211,7 +7722,9 @@ msgstr "Seleccionar modo de terminal"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Servidor de Logs"
 
@@ -7222,6 +7735,7 @@ msgid "Choose server to use for logging"
 msgstr "Elija un servidor que será usado para registro"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Servidor Raíz"
 
@@ -7230,6 +7744,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
@@ -7379,6 +7894,128 @@ msgstr "Por favor especifique un rango HSync valido"
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Ha fallado la grabación de la información del servicio de terminal"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Servicios"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Tamaño del monitor"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "método"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nuevo controlador de dispositivo"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolución"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Profundidad del Color"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Elija modelo de teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Elija localización del teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Elija variante de teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo MIME"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Punto de montaje"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7394,6 +8031,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Comprobar parámetros"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Nombre del servidor"
@@ -7411,6 +8071,7 @@ msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Nombre de la estación de trabajo"
 
@@ -7440,10 +8101,6 @@ msgstr "URL de la impresora"
 msgid "Driver"
 msgstr "Controlador"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Permisos"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Usuarios que tienen permiso para acceder a esta impresora"
@@ -7554,6 +8211,38 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Parámetros del usuario"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Acción"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7621,6 +8310,17 @@ msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "a la carpeta"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
@@ -7677,13 +8377,32 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "¡No puede editar este tipo de objeto todavía!"
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Sistemas"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "¡No puede editar este tipo de objeto todavía!"
 
 #: plugins/admin/systems/class_systemManagement.inc:236
 msgid "Passwords entered as new and repeated do not match!"
@@ -7730,19 +8449,6 @@ msgstr "Plantilla de estación de trabajo para"
 msgid "New System from incoming"
 msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr "La estación de trabajo se está instalando"
@@ -7790,6 +8496,7 @@ msgid "Zones"
 msgstr "Zonas"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix mydomain"
 
@@ -7798,22 +8505,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix mydestination"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "Servicio POP3"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "Servicio POP3/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "Servicio IMAP"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "Servicio IMAP/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Servicio Sieve"
 
@@ -7832,6 +8544,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Desinfectado de correo Amavis (virus/spam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Parámetros de quotas"
 
@@ -7844,6 +8557,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
@@ -7868,6 +8582,7 @@ msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
@@ -7907,6 +8622,7 @@ msgstr ""
 "aquí."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Zona Inversa"
 
@@ -7944,10 +8660,50 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
 msgid "DNS service"
 msgstr "Añadir servicio DNS"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nombre de la zona"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Servidor DNS primario para esta zona"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Serie"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Expira"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Registros de zona"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Acceso a Kerberos kadmin"
@@ -7959,6 +8715,7 @@ msgstr "Dominio Kerberos"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Usuario administrador"
 
@@ -7995,16 +8752,19 @@ msgstr "Acceso administrador imap"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Identificador de servidor"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Conectar a la URL"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Puerto de Sieve"
 
@@ -8025,6 +8785,7 @@ msgid "Glpi database"
 msgstr "Base de datos Glpi"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Bases de datos"
@@ -8033,6 +8794,78 @@ msgstr "Bases de datos"
 msgid "Machine name"
 msgstr "Nombre de la maquina"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Servidor FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nombre de la localización"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 #, fuzzy
 msgid ""
@@ -8102,6 +8935,39 @@ msgstr "Añadir el servicio Kolab"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Destino"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Enfocado a la versión"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8219,6 +9085,20 @@ msgstr ""
 msgid "Group"
 msgstr "Grupo"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Impresora"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8261,6 +9141,65 @@ msgstr "El campo 'Dirección IP' contiene una dirección no valida."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Nuevo componente"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Dispositivos de Red"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Elija el tipo de componente del sistema que desea crear"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
+"esta razón solo se pueden crear plantillas para un árbol específico. "
+"Normalmente los servidores son añadidos también automáticamente, pero en "
+"algunos casos especiales, puede necesitar crear un servidor virtual para "
+"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
+"usados para que la configuración de 'Nagios' creen las dependencias de "
+"componentes."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Servidor Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Estación de trabajo Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
 msgid "Time server"
@@ -8271,6 +9210,7 @@ msgid "Printer type"
 msgstr "Tipo de impresora"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8284,6 +9224,7 @@ msgstr "Tipo de impresora"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -8292,10 +9233,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr "Interfaces soportados"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Serie"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr "Paralelo"
@@ -8309,11 +9246,15 @@ msgid "Contacts"
 msgstr "Contactos"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Persona de contacto"
 
@@ -8325,78 +9266,31 @@ msgstr "Adjuntos"
 msgid "Installed cartridges"
 msgstr "Cartuchos instalados"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Elija el tipo de componente del sistema que desea crear"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Editar recurso compartido"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
-"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
-"esta razón solo se pueden crear plantillas para un árbol específico. "
-"Normalmente los servidores son añadidos también automáticamente, pero en "
-"algunos casos especiales, puede necesitar crear un servidor virtual para "
-"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
-"usados para que la configuración de 'Nagios' creen las dependencias de "
-"componentes."
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Plantilla de clientes ligeros Linux"
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
+msgid "Volume"
+msgstr "Volumen"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Plantilla de estaciones de trabajo linux"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Servidor Linux"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
+msgstr "Pagina de códigos"
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Estación de trabajo Windows"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Otros componentes de red"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Editar recurso compartido"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Volume"
-msgstr "Volumen"
-
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:94
-msgid "Codepage"
-msgstr "Pagina de códigos"
-
-#: plugins/admin/systems/servnfs.tpl:104
-msgid "Option"
-msgstr "Opción"
+#: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
+msgid "Option"
+msgstr "Opción"
 
 #: plugins/admin/systems/glpi.tpl:9
 #: plugins/admin/systems/SelectDeviceType.tpl:20
@@ -8404,10 +9298,12 @@ msgid "System type"
 msgstr "Tipo de sistema"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "Sistema operativo"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8502,6 +9398,35 @@ msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "Modo DTMF"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Dirección IP por defecto"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8540,6 +9465,20 @@ msgstr "La ruta contiene caracteres no validos."
 msgid "Option contains invalid characters."
 msgstr "La opción contiene caracteres no validos."
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8594,6 +9533,35 @@ msgid ""
 "empty string."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Comprobar parámetros"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "Clases FAI"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Versión actual"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Configuración telefónica avanzada"
@@ -8616,10 +9584,6 @@ msgstr "Elija tipo de teléfono"
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8751,6 +9715,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Sección"
 
@@ -8777,6 +9742,7 @@ msgstr "Controlador de dispositivo de Impresión"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Modelo"
 
@@ -8824,6 +9790,11 @@ msgstr "Seleccionar impresora ppd"
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Nombre de la estación de trabajo"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8874,13 +9845,6 @@ msgstr "Puerto"
 msgid "Choose mouse port"
 msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -8951,11 +9915,6 @@ msgstr "Provee servicios de exploración"
 msgid "Boot parameters"
 msgstr "Parametros de inicio"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -8984,7 +9943,9 @@ msgstr "Servidor FAI"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Versión"
@@ -9038,10 +9999,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Método de conexión"
@@ -9080,10 +10037,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr "Proveer servicios de impresión"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -9094,11 +10047,13 @@ msgid "Select scanner driver to use"
 msgstr "Seleccione que controladores de escáner se usaran"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repositorio"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Servidor Origen"
 
@@ -9126,6 +10081,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
 msgid "Repository service"
 msgstr "Parámetros del repositorio"
@@ -9154,6 +10110,15 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Versión"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Lista de repositorios configurados."
@@ -9166,6 +10131,54 @@ msgstr "Añadir repositorio"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "Usuario de Base de datos"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Gestión de listas de bloqueo"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Administradores"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "Gestionar tipos de sistemas"
@@ -9317,6 +10330,103 @@ msgstr ""
 "Mientras no se encuentra la extensión php_mysql no se puede eliminar la "
 "cuenta glpi."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Nuevo monitor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Nombre del dispositivo"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Añadir/Editar placa base"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Nueva tarjeta de sonido"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Nuevo procesador"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Nuevo dispositivo (otros)"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Nombre del dispositivo"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Nuevo disco duro"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Nombre del dispositivo"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Nueva controladora"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+msgid "Device graphics card"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+msgid "Device power supply"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Mostrar dispositivo"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Gestione fabricantes"
@@ -9353,6 +10463,7 @@ msgstr "Añadir/Editar monitor"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Comentarios"
@@ -9484,6 +10595,7 @@ msgid "Add/Edit network interface"
 msgstr "Añadir/Editar dispositivo de red"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "Dirección MAC"
 
@@ -9814,6 +10926,31 @@ msgstr ""
 msgid "since"
 msgstr "desde"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Parámetros de correo"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9882,6 +11019,21 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "No se ha podido guardar la cuenta de correo"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Parametros de samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Registros DNS"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "Dirección IP"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -9915,18 +11067,10 @@ msgstr "Expresiones regulares que concuerden con tipos de cartuchos"
 msgid "Reference"
 msgstr "Referencia"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nombre de la zona"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Dirección de red"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Registros de zona"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -9943,16 +11087,6 @@ msgstr "Servidor DNS primario para esta zona"
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Expira"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "Registros MX"
@@ -9989,7 +11123,7 @@ msgstr "Elija un grupo de objetos"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr "Abajo"
 
@@ -10322,62 +11456,30 @@ msgstr "Seleccione impresora para añadir"
 msgid "All available services are already in use."
 msgstr "El nombre de dispositivo especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-#, fuzzy
-msgid "FAX service"
-msgstr "Servicio IMAP"
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, fuzzy, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goFaxServer.inc:49
-#, fuzzy
-msgid "FAX database configuration"
-msgstr "Base de datos de FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
-#, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
+#: plugins/admin/systems/class_goCupsServer.inc:206
 #, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
-#, fuzzy, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+msgid "Cups"
+msgstr "Arriba"
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Servicio de sonido"
 
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:27
@@ -10385,6 +11487,25 @@ msgstr ""
 msgid "LDAP service"
 msgstr "Servicio LDAP"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 #, fuzzy
@@ -10482,36 +11603,100 @@ msgstr "Servicio de impresión"
 msgid "Remove service"
 msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
 #, fuzzy
-msgid "Inventory database"
-msgstr "Usuario de Base de datos"
+msgid "Start"
+msgstr "Inicio"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
+#: plugins/admin/systems/class_serverService.inc:9
 #, fuzzy
-msgid "Glpi management"
-msgstr "Gestión de listas de bloqueo"
+msgid "Restart"
+msgstr "Reintentar"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goNtpServer.inc:219
 #, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Servicio de sonido"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Servidor LDAP"
+
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
 msgstr ""
@@ -10531,6 +11716,7 @@ msgid "This value specifies the maximal header size."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 #, fuzzy
 msgid "Max mailbox size"
 msgstr "Tamaño del correo electrónico"
@@ -10540,6 +11726,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 #, fuzzy
 msgid "Max message size"
 msgstr "Mensaje"
@@ -10549,6 +11736,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 #, fuzzy
 msgid "Relay host"
 msgstr "Enfocado a la versión"
@@ -10558,6 +11746,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10572,6 +11761,7 @@ msgid "Domains and routing"
 msgstr "Administradores del dominio"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10594,6 +11784,7 @@ msgid "Restrictions"
 msgstr "Secciones"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 #, fuzzy
 msgid "Restrictions for sender"
 msgstr "Secciones para esta versión"
@@ -10604,6 +11795,7 @@ msgid "Restriction filter"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -10629,142 +11821,37 @@ msgstr "Estado del Sistema"
 msgid "Set status"
 msgstr "Estado del Sistema"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-#, fuzzy
-msgid "Start"
-msgstr "Inicio"
-
-#: plugins/admin/systems/class_serverService.inc:9
-#, fuzzy
-msgid "Restart"
-msgstr "Reintentar"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 #, fuzzy
 msgid "Start IMAP service"
 msgstr "Servicio IMAP"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 #, fuzzy
 msgid "Start IMAP SSL service"
 msgstr "Servicio IMAP/SSL"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 #, fuzzy
 msgid "Start POP3 service"
 msgstr "Servicio POP3"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 #, fuzzy
 msgid "Start POP3 SSL service"
 msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-#, fuzzy
-msgid "Time service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
-msgid "NTP service"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-#, fuzzy
-msgid "The given base is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 #, fuzzy
 msgid "Logging service"
 msgstr "Base de datos de acceso de usuarios"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 #, fuzzy
 msgid "Syslog service"
 msgstr "Servicio de Logs"
@@ -10784,11 +11871,10 @@ msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/class_goSyslogServer.inc:204
 #, fuzzy
-msgid "enabled"
-msgstr "desactivado"
+msgid "Syslog"
+msgstr "Registro del sistema"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 #, fuzzy
@@ -10827,6 +11913,26 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Servidor Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Registros SOA"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Código de cuenta"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10842,12 +11948,24 @@ msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
+#: plugins/admin/systems/class_goLogDBServer.inc:215
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Información genérica del usuario"
+msgid "Log"
+msgstr "Inicio de sesión"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Base de datos de acceso de usuarios"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "desactivado"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 #, fuzzy
 msgid "Kerberos service"
 msgstr "Servidor Kerberos"
@@ -10887,10 +12005,10 @@ msgstr "la clave kerberos especificada está vacía."
 msgid "The specified kerberos realm is empty."
 msgstr "la clave kerberos especificada está vacía."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
+#: plugins/admin/systems/class_goKrbServer.inc:228
 #, fuzzy
-msgid "FAX database information"
-msgstr "Base de datos de FAX"
+msgid "Realm"
+msgstr "RAM"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 #, fuzzy
@@ -10932,6 +12050,25 @@ msgstr "Por favor especifique un valor numérico para expiración."
 msgid "Please specify a numeric value for message size limit."
 msgstr "Por favor especifique un valor numérico para expiración."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Tiempo de envio"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Información genérica del usuario"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 #, fuzzy
 msgid "IMAP/POP3 service"
@@ -10991,10 +12128,25 @@ msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 msgid "The sieve port needs to be numeric."
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
+#: plugins/admin/systems/class_goImapServer.inc:273
 #, fuzzy
-msgid "Logging database information"
-msgstr "Base de datos de Logs"
+msgid "Imap"
+msgstr "Importar"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Servidor IMAP"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Nueva contraseña"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Base de datos de FAX"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 #, fuzzy
@@ -11032,6 +12184,21 @@ msgstr "Ha fallado la eliminación del contenedor de montaje"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Ha fallado la grabación del contenedor de montaje"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Servicio de exploración"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nueva entrada"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Base de datos de Logs"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11053,6 +12220,7 @@ msgid "Phone queue"
 msgstr "Cola de teléfono"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "Sistema"
 
@@ -11070,6 +12238,11 @@ msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr ""
 "Ha fallado la eliminación de los parámetros del correo del objeto grupo"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Estado del Sistema"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Seleccione para ver los departamentos"
@@ -11127,6 +12300,7 @@ msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Grupos de objetos"
@@ -11211,6 +12385,16 @@ msgstr "Ha fallado la grabación del objeto grupo"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Ha fallado la eliminación del objeto grupo"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Objetos miembro"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11237,6 +12421,7 @@ msgid "Generic queue Settings"
 msgstr "Parámetros genéricos de la cola"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Tiempo de espera"
 
@@ -11265,6 +12450,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -11313,26 +12499,32 @@ msgid "Phone attributes "
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -11369,6 +12561,11 @@ msgstr "Ha fallado la grabación del objeto grupo"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Ha fallado la eliminación del objeto grupo"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Grupo primario"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "llamar a todos"
@@ -11501,6 +12698,71 @@ msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr ""
 "Ha fallado la eliminación de los parámetros del correo del objeto grupo"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Cola de correo"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Mensaje de presentación"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "¡Bienvenido %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "Mensaje de Despedida"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "Archivo de sonido 'minutos'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Second' sound"
+msgstr "Archivo de sonido 'segundos'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Número de teléfono"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Mensaje de presentación"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11691,12 +12953,50 @@ msgstr "Instalación Totalmente Automática"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Ha fallado la Creación de la base del script FAI"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Script de importación"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Ruta del Script"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Ha fallado la grabación de la base de la plantilla FAI"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Plantilla de paquete"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Nombre de la plantilla"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Nombre del archivo"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Permisos"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11733,6 +13033,17 @@ msgstr "El nombre de la rama especificado no es válido."
 msgid "Specified freeze name is invalid."
 msgstr "El nombre de la rama suspendida especificada no es valido."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Nombre de la maquina"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Gestión de listas de bloqueo"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Método de instalación"
@@ -11867,71 +13178,108 @@ msgstr ""
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquete"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Nueva lista de paquetes"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Método de instalación"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Script del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Variables del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Por favor introduzca un nombre válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr "Ya existe un perfil con este nombre de clase definido."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Perfiles"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Nuevo perfil"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Ha fallado la grabación del script FAI"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "Clases FAI"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "ok"
+
+#: plugins/admin/fai/class_faiHook.inc:475
+#, fuzzy
+msgid "FAI hook"
+msgstr "Mostrar acciones FAI"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Tareas"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -11948,6 +13296,7 @@ msgid "FS type"
 msgstr "Tipo de FS"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Punto de montaje"
@@ -11958,6 +13307,7 @@ msgid "Size in MB"
 msgstr "Tamaño en Mb"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Opciones de Montaje"
@@ -12042,6 +13392,7 @@ msgid "Variable attributes"
 msgstr "Atributos de las variables"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Contenido de la Variable"
 
@@ -12078,6 +13429,41 @@ msgstr "partición(es) %s"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Tipo de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "Ver la información de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Paticiones"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un valor para el script"
@@ -12095,10 +13481,6 @@ msgstr "Nombre de la clase"
 msgid "Hook attributes"
 msgstr "Atributos de acción"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Tareas"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -12179,6 +13561,11 @@ msgstr "Un nuevo nombre de clase."
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Mostrar variables FAI"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "no se ha subido ningún archivo todavía"
@@ -12226,6 +13613,7 @@ msgid "Destination path"
 msgstr "Ruta de destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -12288,10 +13676,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paquete"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12556,6 +13940,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Grupo primario"
@@ -12579,6 +13964,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtros"
@@ -12660,11 +14046,27 @@ msgstr "Ya existe una aplicación con este 'Nombre'."
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "Tipo MIME"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Crear aplicaciones"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Aplicaciones Usadas"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -12882,6 +14284,36 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Configuración telefónica"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Metodos de envío"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voivemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Parámetros de correo"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13032,6 +14464,20 @@ msgstr "Por favor elija una base válida."
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Ha fallado al grabar la cuenta de nagios"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "macro de texto"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -13167,6 +14613,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
@@ -13177,6 +14624,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Referencias"
@@ -13186,6 +14634,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -13204,15 +14653,11 @@ msgid "Count users"
 msgstr "Pais"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 #, fuzzy
 msgid "Phone conferences"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Nombre de la maquina"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13254,6 +14699,48 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Mantenimiento de Departamentos"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Activar mensaje de ausencia"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Pais"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "formateo"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
@@ -13301,6 +14788,9 @@ msgid "Duration"
 msgstr "Duración"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
@@ -13714,7 +15204,7 @@ msgstr ""
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -13722,7 +15212,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -13730,7 +15220,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -13738,7 +15228,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -13746,62 +15236,62 @@ msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto grupo"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Ha fallado la eliminación del teléfono"
@@ -13811,7 +15301,7 @@ msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 "No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -13819,13 +15309,13 @@ msgstr ""
 "El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
 "favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 #, fuzzy
 msgid "Unknown"
 msgstr "estado desconocido"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -13901,7 +15391,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
@@ -14475,7 +15965,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14595,119 +16085,119 @@ msgstr ""
 msgid "Access control"
 msgstr "Opciones de acceso"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Nivel de log"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Crear nuevo objeto FAI."
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Editar"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Borrar"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Editar clase"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Crear nuevo objeto FAI."
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "estado desconocido"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Ha fallado la grabación del script FAI"
@@ -14813,59 +16303,59 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Borrar"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "No se puede leer la configuración de GOsa (%s/gosa.conf). Se ha abortado la "
 "operación."
 
-#: html/index.php:134
+#: html/index.php:142
 #, fuzzy, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:285
+#: html/index.php:293
 #, fuzzy
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
 "sistemas."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15202,10 +16692,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN del administrador"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Nueva contraseña"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15518,8 +17004,31 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Tamaño de la Cola de correo"
+#~ msgid "Day"
+#~ msgstr "día"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Elija modelo de teclado"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Elija variante de teclado"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Volumen"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Identificador de servidor"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Certificado estandar"
 
 #, fuzzy
 #~ msgid "Vocation message"

diff --git a/locale/fr/LC_MESSAGES/messages.mo b/locale/fr/LC_MESSAGES/messages.mo
index 4acb46fb18409c57f56188f2157b1dad547d7a53..922fe74931c00f2917b1a369e1064650c7421ac7 100644 (file)
Binary files a/locale/fr/LC_MESSAGES/messages.mo and b/locale/fr/LC_MESSAGES/messages.mo differ

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 242672d03d9db194ae3ac66c9dfd697d10f55dce..a0218fc3b8e42ada6649475a70c984c39fa8919f 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,12 +1,14 @@
 # translation of messages.po to Français
 # Benoit Mortier <benoit.mortier@opensides.be>, 2005, 2006.
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2006-06-12 21:33+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -16,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Mon Compte"
 
@@ -25,6 +27,7 @@ msgid "Administration"
 msgstr "Administration"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Extensions"
 
@@ -36,18 +39,29 @@ msgstr "Extensions"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -57,7 +71,9 @@ msgstr "Extensions"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Informations"
@@ -68,6 +84,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -75,16 +92,21 @@ msgstr "Environnement"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Messagerie"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -99,23 +121,28 @@ msgstr "Netatalk"
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Connectivité"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -127,16 +154,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Téléphone"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -160,6 +190,8 @@ msgid "Parameter"
 msgstr "Paramètres"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Démarrage"
@@ -171,8 +203,9 @@ msgstr "Périphériques"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -242,6 +275,7 @@ msgstr "Partitions"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -269,7 +303,7 @@ msgstr "Profils"
 msgid "Summary"
 msgstr "Sommaire"
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Paquets"
 
@@ -384,7 +418,7 @@ msgstr "Utilisateur dont on montre les adresses"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -430,12 +464,12 @@ msgstr "Utilisateur dont on montre les adresses"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -491,9 +525,9 @@ msgstr "Ajouter"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -517,8 +551,8 @@ msgstr "Ajouter"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -529,8 +563,8 @@ msgstr "Ajouter"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -564,6 +598,7 @@ msgstr "Adresse principale"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -587,8 +622,9 @@ msgid "not defined"
 msgstr "non défini"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Taille des Quota"
 
@@ -711,14 +747,14 @@ msgstr "Rejeter les messages plus gros que"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Message d'absence"
 
@@ -751,7 +787,7 @@ msgstr ""
 "locaux"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Utiliser des scripts sieve personnalisés"
 
@@ -771,7 +807,7 @@ msgstr "désactive toutes les options de messagerie!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -821,7 +857,7 @@ msgid "User mail settings"
 msgstr "Configuration du compte de messagerie de l'utilisateur"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
@@ -878,27 +914,27 @@ 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:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Impossible d'obtenir les informations de quota pour '%s'."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "Pas de drapeau DESC dans le message d'absence:"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Ce compte n'a pas d'extensions de messagerie."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Supprimer le compte de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -907,13 +943,13 @@ 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:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Créer un compte de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -922,20 +958,20 @@ 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:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 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:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Utiliser une de vos adresses comme adresse de renvoi n'a pas de sens."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -944,35 +980,35 @@ msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
 "adresses alternatives."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr "L'adresse entrée est déjà utilisée par un utilisateur"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "La suppression du compte de messagerie à échoué"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "La sauvegarde du compte de messagerie à échoué"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 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:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 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:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
@@ -980,41 +1016,41 @@ msgstr ""
 "Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
 "Principale'."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "L'adresse principale entrée est déjà utilisée."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 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:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 "Veuillez indiquer une taille valide pour les messages devant être rejetés."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Il est nécessaire d'indiquer une taille maximale des messages afin de "
 "pouvoir en rejeter certains."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 "Vous avez activé les réglages antispam, mais aucun dossier de destination "
 "n'a été précisé."
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr "En attente de l'effacement des propriétés de messagerie par kolab."
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1022,62 +1058,67 @@ msgstr ""
 "Veuillez effacer en premier lieu le compte de messagerie pour permettre a "
 "kolab d'appeler sa procédure d'effacement"
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Serveur de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "Taille des quota email"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Adresse principale"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Rejeter les messages plus gros que"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
 msgid "Spam level"
 msgstr "Log Level"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Taille maximale de la boite de messagerie"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Adresses alternatives"
@@ -1164,10 +1205,15 @@ msgstr "Retour"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1229,8 +1275,8 @@ msgstr ""
 "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1238,16 +1284,17 @@ msgid "Home directory"
 msgstr "Répertoire Home"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Groupe principal"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1267,6 +1314,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1285,7 +1333,7 @@ msgid "Account"
 msgstr "Compte"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Système de Confiance"
 
@@ -1692,54 +1740,54 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "Compte GLPI"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Groupes"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Masquer"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Masquer"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Masquer"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Masquer"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Afficher les paquets"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Afficher les utilisateurs"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Système de Confiance"
@@ -1773,7 +1821,7 @@ msgstr ""
 "cliente"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr ""
 "L'identification sur une station windows ne nécessite pas de mot de passe"
@@ -1783,7 +1831,7 @@ msgid "Temporary disable samba account"
 msgstr "Désactiver temporairement le compte Samba"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Domaine"
 
@@ -1792,12 +1840,12 @@ msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
@@ -1862,17 +1910,17 @@ msgid "Reconnect if disconnected"
 msgstr "Reconnexion si déconnecté"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Limiter les temps d'accès"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Limiter les heures de deconnections"
 
@@ -1885,7 +1933,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Configuration Samba"
 
@@ -2013,43 +2061,43 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "La sauvegarde du compte Samba à échoué"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "Le compte expire après"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr ""
 "Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
 "cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "Le mot de passe expirera le"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Répertoire Home"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Chemin du Script"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Chemin du Profile"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permet la connections depuis ces stations seulement"
@@ -2091,66 +2139,61 @@ msgstr "invalide"
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "La suppression du compte générique à échoué"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "La sauvegarde du compte générique à échoué"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "La communication vers la base de données kerberos a échoué"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 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:910
+#: plugins/personal/generic/class_user.inc:912
 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:954
-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:959
+#: plugins/personal/generic/class_user.inc:958
 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:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 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:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 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:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2158,109 +2201,109 @@ msgstr ""
 "Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
 "chiffres et tirets sont autorisés."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 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:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Le champ 'Nom' contient des caractères invalides."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Le champ 'Nom complet' contient des caractères invalides."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 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:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Le champ 'Fax' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Le champ 'GSM' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Le champ 'Bip' contient un numéro invalide."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "Impossible d'ouvrir le certificat demandé!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Identifiant du batiment"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2271,69 +2314,111 @@ msgstr "Code postal"
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des queues"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Base"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Mettre le mot de passe à blanc"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr "Adresse postale personelle"
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Entreprise"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2346,188 +2431,160 @@ msgstr "Entreprise"
 msgid "Department"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Expéditeur"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Langue préferée"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Nom du département"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Image de l'utilisateur"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Certificat standard"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr "Adresse postale"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Numéro de série"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Certificat standard"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Image personnelle"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Changer la photo"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Identifiant"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Activer"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Langue préferée"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2551,67 +2608,69 @@ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
 msgid "Select a base"
 msgstr "Sélectionnez une base"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Modification des certificats"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Modifier les propriétés"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2619,7 +2678,7 @@ msgstr "GSM"
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
@@ -2657,8 +2716,8 @@ msgstr "Suppression de l'image personnelle"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2687,7 +2746,7 @@ msgstr "Certificat standard"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2721,10 +2780,6 @@ msgstr "Numéro de série du certificat"
 msgid "User settings"
 msgstr "Préférences utilisateur"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Image de l'utilisateur"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Mettre le mot de passe à blanc"
@@ -2788,6 +2843,7 @@ msgid "Temporary disable FTP access"
 msgstr "Désactiver temporairement l'accès FTP"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Compte Proxy"
 
@@ -2800,6 +2856,7 @@ msgid "Limit proxy access to working time"
 msgstr "Accès au proxy autorisé durant la plage horaire suivante"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Restreindre la quantité de données téléchargeables"
 
@@ -2811,16 +2868,39 @@ msgstr "par"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "La suppression de l'extension PHPgw à échoué"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "La sauvegarde du compte PHPgw à échoué"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Préférences des groupes"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "Le compte expire après"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Compte"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Compte PHPGroupware"
@@ -2839,6 +2919,7 @@ msgstr ""
 "vous ajoutez un compte mail."
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr "Delegation"
 
@@ -2874,17 +2955,19 @@ msgid "Invitation policy"
 msgstr "Politique d'invitation"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
 "délégations."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2892,131 +2975,193 @@ msgstr ""
 "L'adresse de messagerie que vous essayez de rajouter n'est pas l'adresse "
 "primaire d'un utilisateur existant."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr "Toujours accepter"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr "Toujours rejeter"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr "Reconnexion si il y a conflit"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr "Manuel si il y a conflit"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Manuel"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "La suppression du compte générique à échoué"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 "La valeur spécifiée comme information de disponibilité future doit être un "
 "entier."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 "La valeur spécifiée comme URL d'information de disponibilité est invalide."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "La politique d'invitation pour l'adresse '%s' n'est pas valide."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "Il n'y a pas d'utilisateur avec l'adresse de messagerie '%s' pour votre "
 "politique d'invitation!"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "La sauvegarde du compte Kolab à échoué"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Compte Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Liste de distribution"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Information de disponibilité"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "La suppression du compte webDAV à échoué"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "La sauvegarde du Compte WebDAV à échoué"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Compte WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "La suppression de l'extension pureftpd à échoué"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 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:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 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:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 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:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 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:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 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_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "La sauvegarde du compte pureftpd à échoué"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Compte WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "FS type"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Compte Open-Xchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Créer un compte FAX"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
-"désactivé, le support pour Postgresql est manquant. Ou la base de données "
-"spécifiée ne peut pas être contactée"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Taille des Quota"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Télécharger"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Taille des Quota"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Télécharger la configuration"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Bande passante montante"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Bande passante descendante"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Compte Open-Xchange"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+"désactivé, le support pour Postgresql est manquant. Ou la base de données "
+"spécifiée ne peut pas être contactée"
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -3046,30 +3191,30 @@ msgstr "Zone Horaire de l'utilisateur"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr "Impossible de se connecter a la base de données Postgresql!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "Les paramètres nécessaires à l'extension openexchange ne sont pas "
 "disponibles!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "Le module PHP4 pour postgresql est manquant!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "La suppression du carnet d'adresse oxchange à échoué"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
@@ -3077,20 +3222,50 @@ msgstr ""
 "Le nom de l'utilisateur Open-Xchange est vide donc invalide! Veuillez "
 "vérifier que "
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr "vous n'utilisez pas des caractères interdits."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "La sauvegarde duc ompte oxchange à échoué"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "La sauvegarde duc ompte oxchange à échoué"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Compte Open Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Rendez vous"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Tâches"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "activé"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Zone Horaire de l'utilisateur"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Créer un compte Intranet"
@@ -3099,94 +3274,145 @@ msgstr "Créer un compte Intranet"
 msgid "This account has no connectivity extensions."
 msgstr "Ce compte n'as pas d'extension de connectivité."
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Connectivité"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Connectivité"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "heure"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "jour"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "semaine"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "mois"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "La suppression du compte proxy à échoué"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr "La valeur pour le quota est vide."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "La valeur dans le champ 'Paramètres du quota' n'est pas valide."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "La sauvegarde du compte Compte Proxy à échoué"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Accès au proxy autorisé durant la plage horaire suivante"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Quota du profil"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Période de notification pour les systèmes"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "Compte PPTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "La suppression du compte netatalk à échoué"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "La sauvegarde du compte Intranet à échoué"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Créer un compte Intranet"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Créer un compte Intranet"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "Compte GLPI"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr "Compte PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "La suppression du compte PPTP à échoué"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "La sauvegarde du Compte à échoué"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr "Compte PHPGroupware"
 
@@ -3210,6 +3436,7 @@ msgid "Teams"
 msgstr "Equipes"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr "Compte PHPscheduleit"
 
@@ -3217,21 +3444,31 @@ msgstr "Compte PHPscheduleit"
 msgid "PHPscheduleit"
 msgstr "Compte PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "La suppression du compte PHPscheduleit à échoué"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "La sauvegarde du Compte PHPscheduleit à échoué"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "Compte PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "Compte PHPscheduleit"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Compte Opengroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
@@ -3239,7 +3476,7 @@ msgstr ""
 "OpenGroupware: Votre configuration ne possède pas d'extension postgresql. "
 "Impossible d'effectuer des recherches."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
@@ -3247,7 +3484,7 @@ 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
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3255,6 +3492,16 @@ msgstr ""
 "OpenGorupware: Impossible de se connecter à la base de données spécifiée. "
 "Veuillez vérifier la configuration."
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Compte Opengroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Compte Opengroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "L'extension d'environnement est actuellement désactivée."
@@ -3286,7 +3533,7 @@ msgid "Profil quota"
 msgstr "Quota du profil"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr "Cacher le profile en local"
 
@@ -3295,7 +3542,7 @@ msgid "Kiosk profile settings"
 msgstr "Paramètres du profil Kiosk"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr "Profil Kiosk"
 
@@ -3304,24 +3551,26 @@ msgid "Manage"
 msgstr "Gérer"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr "La résolution peut être changée pendant la session"
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Résolution"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Partages"
 
@@ -3574,26 +3823,30 @@ msgid "Administrator"
 msgstr "Administrateur"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Imprimante par défaut"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Utiliser les préférences d'environnement"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Serveur de fichier"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Quota du profil"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Script de démarrage"
@@ -3638,28 +3891,51 @@ msgstr "Nom du script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3695,7 +3971,7 @@ msgstr "Le script peut être remplacé par l'utilisateur"
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3793,30 +4069,37 @@ msgid "Nagios Account"
 msgstr "Compte Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias de l'utilisateur"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Période de notification pour les systèmes"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Période de notification pour les services"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Options pour la période de notification pour les services"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Options pour la notification des systèmes"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Commandes pour la notification des services"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Commandes pour la notification des systèmes"
 
@@ -3905,6 +4188,46 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "La suppression du compte nagios à échoué"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Paramètres Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "Voir tout les hôtes"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Voir tout les services"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Permettre les commandes systêmes"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "permettre les commandes sur tout les hôtes"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Permettre les commandes sur tout les services"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "voir les informations de configuration"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "voir les informations sur le système"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Paramètres Nagios"
@@ -3960,12 +4283,26 @@ msgstr "La sauvegarde du compte Netatalk à échoué"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "La suppression du compte netatalk à échoué"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Répertoire Home"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Partage"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr "Chemin"
 
@@ -3983,13 +4320,16 @@ msgstr "Sélectionnez la branche où sera situé la liste rouge"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -4014,7 +4354,48 @@ msgstr "Numéros bloqués"
 msgid "Numbers can also contain wild cards."
 msgstr "Les nombres peuvent aussi contenir des jokers."
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "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."
+msgstr ""
+"Veuillez vous assurez que vous voulez effectuer 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/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
+"'Annuler' pour abandonner."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Configuration des listes rouges"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Liste Rouge des Fax"
 
@@ -4044,73 +4425,97 @@ msgstr "recevoir"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "La suppression de l'objet blocklist à échoué"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 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:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Le champ obligatoire 'Nom' contient des caractères invalides"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "Le nom spécifié est déjà utilisé."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 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."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "La sauvegarde de l'objet blocklist à échoué"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-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."
-msgstr ""
-"Veuillez vous assurez que vous voulez effectuer 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/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Liste Rouge des Fax"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
-"'Annuler' pour abandonner."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Nom"
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Configuration des listes rouges"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+#, fuzzy
+msgid "Blocklist type"
+msgstr "Nom de la liste rouge"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4249,12 +4654,12 @@ msgstr "Monter d'un département"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr "Au dessus"
 
@@ -4388,7 +4793,7 @@ msgstr "Soumettre le département"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "éditer"
 
@@ -4415,7 +4820,7 @@ msgstr "Editer un utilisateur"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "supprimer"
 
@@ -4430,7 +4835,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numéro de fax pour lesquels GOfax s'activera"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Langue"
@@ -4442,6 +4849,7 @@ msgstr ""
 "passerelle de messagerie"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Format de distribution"
 
@@ -4468,6 +4876,7 @@ msgid "Deliver fax as mail"
 msgstr "Délivrer les fax comme des messages"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Imprimer directement les fax"
 
@@ -4608,6 +5017,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "La sauvegarde du compte générique à échoué"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Configuration Samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Afficher les listes rouges de correspondants"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Afficher les numéros d'appels de la liste rouge"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4772,39 +5200,16 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "A-M-J"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Nom"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Rapports des Fax"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Périphériques installés"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4935,7 +5340,7 @@ msgstr "Ville"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Pays"
 
@@ -5655,7 +6060,8 @@ msgid "Notifications"
 msgstr "Travail"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Groupes"
@@ -5739,12 +6145,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5881,6 +6287,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Paramètres par défaut des queues"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Les membres sont dans un groupe téléphonique"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Compte Nagios"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Membre du groupe"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Groupe Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Version utilisée"
@@ -5901,7 +6337,8 @@ msgstr "Ajouter une catégorie"
 msgid "Available applications"
 msgstr "Applications disponibles"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "lecture"
 
@@ -5917,7 +6354,8 @@ msgstr "envoi externe"
 msgid "append"
 msgstr "ajouter"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "écrire"
 
@@ -5960,6 +6398,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Veuillez sélectionner un serveur de messagerie valide."
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nom du groupe"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Adresses alternatives"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Adresse principale"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Permissions"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Administrateurs du répertoire"
@@ -6051,18 +6510,6 @@ msgstr "Afficher les utilisateurs du département"
 msgid "Regular expression for matching user names"
 msgstr "Expression régulière concordant avec les noms des utilisateurs"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Options des applications"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Afficher les adresses du département"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Afficher les adresses correspondantes"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Ce 'dn' n'est pas un groupe d'applications."
@@ -6172,6 +6619,40 @@ msgstr ""
 "Impossible de trouver la version '%s', le nom sera '%s'. Probablement que "
 "les objets de base ont changés."
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Afficher les applications"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Applications"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nom de l'application"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Options des applications"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Afficher les adresses du département"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Afficher les adresses correspondantes"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Préférences des groupes"
@@ -6260,14 +6741,6 @@ msgstr "Créer un nouveau groupe"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Applications"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6383,6 +6856,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Modèle"
 
@@ -6543,7 +7017,9 @@ msgid "Application name"
 msgstr "Nom de l'application"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Nom à afficher"
 
@@ -6553,6 +7029,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Le nom de l'application à afficher (ex: en dessous des icônes)"
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6574,7 +7051,9 @@ msgstr ""
 "l'application"
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icône"
 
@@ -6588,22 +7067,27 @@ msgid "Reload picture from LDAP"
 msgstr "Recharger l'image à partir de l'annuaire LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Exécutable uniquement par les membres"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Remplacer la configuration de l'utilisateur au démarrage"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Placer une icône sur le bureau des membres"
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
@@ -6645,6 +7129,7 @@ msgstr ""
 "cliquant en-dessous."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variable"
 
@@ -6753,6 +7238,20 @@ msgstr "La sauvegarde de l'application à échouée"
 msgid "Application settings"
 msgstr "Préférences de l'application"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nom de l'application"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Contenu de la variable"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6817,6 +7316,7 @@ msgid "Descriptive text for department"
 msgstr "Description du département"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Catégorie"
 
@@ -6852,6 +7352,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Numéro de fax de base pour cette sous-branche"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Paramètres administratifs"
 
@@ -6860,10 +7361,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr "Marquer le département comme une entité administrative indépendante"
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 "Impossible de bouger l'arbre. L'arbre de destination est un sous arbre de "
@@ -6920,73 +7421,87 @@ msgstr ""
 msgid "Department management"
 msgstr "Gestion des départements"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "La suppression du département à échoué"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 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:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Un département ayant ce 'Nom' existe déjà."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Le champ obligatoire 'Description' n'est pas rempli."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 "Le champ 'Nom' contient le mot réservé '%s'. Veuillez choisir un autre nom."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 "Erreur fatale: Impossible de trouver un marqueur libre pour marquer l'entité "
 "administrative!"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "La sauvegarde du département à échoué"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Marquer '%s'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Objet"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Impossible de copier %s, arrêt de l'opération"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Départements"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nom du département"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -7004,20 +7519,6 @@ msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Téléphone"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Nom du département"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -7068,6 +7569,7 @@ msgid "Enable DNS for this device"
 msgstr "Activer le DNS pour ce périphérique"
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -7080,6 +7582,8 @@ msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7146,11 +7650,14 @@ msgid "Terminal Service"
 msgstr "Services de terminaux"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Désactiver temporairement le login"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Répertoire des polices de caractères"
@@ -7318,8 +7825,11 @@ msgstr "Sélectionnez la branche où placer le terminal"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Mode"
 
@@ -7331,7 +7841,9 @@ msgstr "Sélectionnez le mode du terminal"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Serveur de logs systèmes"
 
@@ -7342,6 +7854,7 @@ msgid "Choose server to use for logging"
 msgstr "Sélectionnez le serveur de logs à utiliser"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Serveur Primaire"
 
@@ -7350,6 +7863,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Sélectionnez le système de fichier root NFS à utiliser"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Serveur de Swap"
 
@@ -7501,6 +8015,127 @@ msgstr ""
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "La sauvegarde des Informations sur les services du terminal à échoué"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Services"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr "Services de terminaux"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Taille écran"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "méthode"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Bureau distant"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nouveau pilote"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Résolution"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Profondeur des couleurs"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "Fréquence de synchronisation Horizontale"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "Fréquence de synchronisation verticale"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Service d'impression"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Serveur de file d'attente"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "activé"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "activé"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Sélectionnez le modèle du clavier"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Sélectionnez la disposition du clavier"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Sélectionnez la variante du clavier"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "type mime"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Point de montage"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Matériel téléphonique"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, fuzzy, php-format
@@ -7516,6 +8151,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "La sauvegarde des paramètres de démarrage du terminal à échoué"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Modèle de terminaux"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Serveur Ldap"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Kernel utilisé au démarrage"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Vérifier le paramètre"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Nom du serveur"
@@ -7533,6 +8191,7 @@ msgid "Workstation template"
 msgstr "Modèle de station de travail"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
@@ -7562,10 +8221,6 @@ msgstr "URL de l'imprimante"
 msgid "Driver"
 msgstr "Pilote"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Permissions"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
@@ -7678,6 +8333,38 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Services de terminaux"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Serveur de logs systèmes"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Préférences utilisateur"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Action"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7745,6 +8432,17 @@ msgstr "Vous n'avez pas l'autorisation pour créer un serveur sur cette 'Base'."
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Nom du serveur"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "vers le répertoire"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Suppression du service DHCP"
@@ -7803,13 +8501,32 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "La sauvegarde des services de la station de travail à échoué"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systèmes"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Nom de la station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "Impossible d'éditer ce type d'objet pour le moment!"
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Stations de travail"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Serveur NTP"
+
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systèmes"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "Impossible d'éditer ce type d'objet pour le moment!"
 
 #: plugins/admin/systems/class_systemManagement.inc:236
 msgid "Passwords entered as new and repeated do not match!"
@@ -7859,19 +8576,6 @@ msgstr "Modèle de station de travail pour"
 msgid "New System from incoming"
 msgstr "Nouveau système depuis l'arrivée"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Stations de travail"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr "La station de travail s'installe"
@@ -7919,6 +8623,7 @@ msgid "Zones"
 msgstr "Zones"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix mondomaine"
 
@@ -7927,22 +8632,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix madestination"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "Service POP3"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "Service POP3/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "Service IMAP"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "Service IMAP/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Service sieve"
 
@@ -7961,6 +8671,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Scan des messages par Amavis (antivirus/antispam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Préférences des quotas"
 
@@ -7975,6 +8686,7 @@ msgstr ""
 "anonyme"
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "Réseaux SMTP privilègiés"
 
@@ -7999,6 +8711,7 @@ msgid "Host used to relay mails"
 msgstr "Machine utilisée pour relayer les mails"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Accepter le courrier électronique venant d'internet"
 
@@ -8039,6 +8752,7 @@ msgstr ""
 "le bouton ci-dessous."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Zone inverse"
 
@@ -8077,9 +8791,49 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 msgid "DNS service"
 msgstr "Service DNS"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nom de la zone"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Serveur dns primaire pour cette zone"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Série"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Réessayer"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Expire"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Enregistrement de zone"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Accès kadmin Kerberos"
@@ -8091,6 +8845,7 @@ msgstr "Realm Kerberos"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Administrateur"
 
@@ -8127,16 +8882,19 @@ msgstr "Accès administrateur IMAP"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Identifiant du serveur"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "URL de connexion"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "port Sieve"
 
@@ -8157,6 +8915,7 @@ msgid "Glpi database"
 msgstr "Base de données GLPI"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Base de données"
@@ -8165,6 +8924,76 @@ msgstr "Base de données"
 msgid "Machine name"
 msgstr "Nom de la machine"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr "Service FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr "Configuration de la base de données des FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr ""
+"L'attribut de l'utilisateur est vide ou contient des caractères invalides."
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Le mot de passe est vide ou contient des caractères invalides."
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"La commande '%s', spécifiée dans le ACTION_HOOK de l'extension '%s' n'existe "
+"pas."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Serveur de Fax"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Service sieve"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nom de l'emplacement"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -8233,6 +9062,39 @@ msgstr "Service de messagerie Kolab"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Service de messagerie Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Destinataire"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Service d'option de disponibilité par HTTP (ancien)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Hôte relai"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Service d'option de disponibilité par HTTP (ancien)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8359,6 +9221,20 @@ msgstr ""
 msgid "Group"
 msgstr "Groupes"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Services d'impression"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Imprimante"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8403,6 +9279,65 @@ msgstr "Le champ adresse IP contient une adresse invalide."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Nouveau composant"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Périphériques réseau"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Choisissez le type de composant système que vous souhaitez créer"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Les terminaux Linux et les stations de travail sont automatiquement créés au "
+"démarrage. Pour cette raison vous pouvez créer un modèle uniquement pour une "
+"branche spécifique. Les serveurs sont également ajoutés automatiquement, "
+"mais dans certains cas vous pouvez avoir besoin de créer une pseudo entrée "
+"serveur afin de fournir à GOsa diverses informations. Les autres composants "
+"réseaux peuvent être utilisés lors la configuration de Nagios afin de créer "
+"les dépendances des composants."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Modèle de client léger Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Modèle de station de travail Linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Serveur Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Station de travail Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Imprimante réseau"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Autre composant réseau"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Créer"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 msgid "Time server"
 msgstr "Services de temps"
@@ -8412,6 +9347,7 @@ msgid "Printer type"
 msgstr "Type de l'imprimante"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8425,6 +9361,7 @@ msgstr "Type de l'imprimante"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr "Fabricant"
@@ -8433,10 +9370,6 @@ msgstr "Fabricant"
 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"
@@ -8450,11 +9383,15 @@ msgid "Contacts"
 msgstr "Contacts"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr "Responsable technique"
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Personne de contact"
 
@@ -8466,55 +9403,6 @@ msgstr "Documents liés"
 msgid "Installed cartridges"
 msgstr "Cartouches installés"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Choisissez le type de composant système que vous souhaitez créer"
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Les terminaux Linux et les stations de travail sont automatiquement créés au "
-"démarrage. Pour cette raison vous pouvez créer un modèle uniquement pour une "
-"branche spécifique. Les serveurs sont également ajoutés automatiquement, "
-"mais dans certains cas vous pouvez avoir besoin de créer une pseudo entrée "
-"serveur afin de fournir à GOsa diverses informations. Les autres composants "
-"réseaux peuvent être utilisés lors la configuration de Nagios afin de créer "
-"les dépendances des composants."
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Modèle de client léger Linux"
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Modèle de station de travail Linux"
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Serveur Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Station de travail Windows"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Imprimante réseau"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Autre composant réseau"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Créer"
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Editer un partage"
@@ -8524,6 +9412,7 @@ msgid "NFS setup"
 msgstr "Préférences NFS"
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Volume"
 msgstr "Volume"
 
@@ -8536,6 +9425,7 @@ msgid "Codepage"
 msgstr "Codage caractêres"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Option"
 msgstr "Option"
 
@@ -8545,10 +9435,12 @@ msgid "System type"
 msgstr "Type de système"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "Système d'exploitation"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8645,6 +9537,35 @@ msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Numéro de téléphone"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Matériel téléphonique"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "Mode DTMF"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Adresse ip par défaut"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8685,6 +9606,20 @@ msgstr "Le chemin contient des caractères invalides."
 msgid "Option contains invalid characters."
 msgstr "L'option contient des caractères invalides."
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Service DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "Jeu de composants"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8750,6 +9685,35 @@ msgstr ""
 "La commande spécifié REPOSITORY_HOOK '%s', spécifié dans votre gosa.conf, "
 "retourne une chaîne vide."
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Statut du système"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Vérifier le paramètre"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "Classes FAI"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Version actuelle"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Configuration avancée du téléphone"
@@ -8772,10 +9736,6 @@ msgstr "Sélectionnez un type de téléphone"
 msgid "refresh"
 msgstr "Rafraichir"
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "Mode DTMF"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8919,6 +9879,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Section"
 
@@ -8945,6 +9906,7 @@ msgstr "Pilote d'Imprimante"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Modèle"
 
@@ -8992,6 +9954,11 @@ msgstr "Sélection du ppd de votre imprimante."
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "La sauvegarde des services de la station de travail à échoué"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Nom de la station de travail"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -9042,13 +10009,6 @@ msgstr "Port"
 msgid "Choose mouse port"
 msgstr "Sélectionnez le port de la souris"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Matériel téléphonique"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -9120,11 +10080,6 @@ msgstr "Fournir des services de scanner"
 msgid "Boot parameters"
 msgstr "Paramètre de démarrage"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Kernel utilisé au démarrage"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -9151,7 +10106,9 @@ msgstr "Serveur FAI"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Version"
@@ -9206,10 +10163,6 @@ msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
 msgid "use debug mode for startup"
 msgstr "utilisez le mode de débogage pour le démarrage"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Bureau distant"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Méthode de connexion"
@@ -9246,10 +10199,6 @@ msgstr "Sélectionnez pour démarrer le service d'impression IPP sur le terminal
 msgid "Provide print services"
 msgstr "Fournir des services d'impression"
 
-#: plugins/admin/systems/terminalService.tpl:189
-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"
@@ -9259,11 +10208,13 @@ msgid "Select scanner driver to use"
 msgstr "Sélectionnez le pilote du scanner"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Dépôt"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Serveur Père"
 
@@ -9291,6 +10242,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 msgid "Repository service"
 msgstr "Service de dépôt"
 
@@ -9323,6 +10275,15 @@ msgstr "Le nom spécifié est déjà utilisé."
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Version"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Liste des dépôts configurés."
@@ -9336,6 +10297,53 @@ 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_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr "Base de données d'inventaire"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr "Configuration de Glpi"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr ""
+"l'attribut de la base de données est vide ou contient des caractères "
+"invalides."
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Serveur de messagerie"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Service sieve"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Administrateurs"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "Gérer le type de système"
@@ -9492,6 +10500,105 @@ msgstr ""
 "Impossible de supprimer l'extension glpi, l'extension mysql n'est pas "
 "disponible."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Enlever l'extension d'impression"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Document lié"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Document lié"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Document lié"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Document lié"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Nouvel écran"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Nom du périphérique"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Ajouter/Modifier une carte mère"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Nouvelle carte son"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Nouveau processeur"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Nouveau périphérique"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Nom du périphérique"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Nouveau disque dur"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Nom du périphérique"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Nouveau controlleur"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+#, fuzzy
+msgid "Device graphics card"
+msgstr "Nouvelle carte graphique"
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+#, fuzzy
+msgid "Device power supply"
+msgstr "Nouvelle alimentation"
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Écran"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Gérer les Fabricants"
@@ -9530,6 +10637,7 @@ msgstr "Ajouter/Modifier un écran"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Commentaires"
@@ -9661,6 +10769,7 @@ msgid "Add/Edit network interface"
 msgstr "Ajouter/Modifier une carte réseau"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "Adresse MAC"
 
@@ -10000,6 +11109,31 @@ msgstr ""
 msgid "since"
 msgstr "depuis"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Ajouter une extension d'imprimante"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Interfaces supportées"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Interfaces supportées"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Interfaces supportées"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Cartouches"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -10077,6 +11211,21 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "La sauvegarde du compte de messagerie à échoué"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Configuration Samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Enregistrement dns"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "Adresse IP"
+
 #: 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"
@@ -10116,18 +11265,10 @@ msgstr "Expression régulière pour sélectionner les cartouches correspondantes
 msgid "Reference"
 msgstr "Référence"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nom de la zone"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Adresse réseau"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Enregistrement de zone"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr "Impossible d'éditer la zone car elle est actuellement éditée."
@@ -10144,16 +11285,6 @@ msgstr "Serveur dns primaire pour cette zone"
 msgid "Serial number (automatically incremented)"
 msgstr "Numéro de série (incrémenté automatiquement)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Réessayer"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Expire"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "Enregistrements mx"
@@ -10196,7 +11327,7 @@ msgstr "Choisissez un groupe d'objets"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr "En bas"
 
@@ -10548,65 +11679,56 @@ msgstr "Service à ajouter"
 msgid "All available services are already in use."
 msgstr "Tout les service disponibles sont déjà utilisés."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
-msgstr "Service FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
-msgstr "Configuration de la base de données des FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "La sauvegarde des services du serveur à échoué"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "La sauvegarde des services du serveur à échoué"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
-msgid "The attribute user is empty or contains invalid characters."
-msgstr ""
-"L'attribut de l'utilisateur est vide ou contient des caractères invalides."
+#: plugins/admin/systems/class_goCupsServer.inc:206
+#, fuzzy
+msgid "Cups"
+msgstr "au dessus"
 
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Service Cyrus"
+
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
+msgstr "Service LDAP"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:79
 #, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Le mot de passe est vide ou contient des caractères invalides."
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
 #, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
 msgstr ""
-"La commande '%s', spécifiée dans le ACTION_HOOK de l'extension '%s' n'existe "
-"pas."
 
-#: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
-msgid "LDAP service"
-msgstr "Service LDAP"
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+"Serveur de terminaux, le chemin vers les polices de caractère doit être "
+"spécifié."
 
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
@@ -10687,34 +11809,94 @@ msgstr "Editer le service"
 msgid "Remove service"
 msgstr "Supprimer le service"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
-msgid "Inventory database"
-msgstr "Base de données d'inventaire"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr "Arrêter"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
-msgid "Glpi management"
-msgstr "Configuration de Glpi"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
+msgstr "Démarrer"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
+msgstr "Redémarrer"
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr "Impossible d'activer le statut tant que ce serveur n'est pas sauvé"
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr "La méthode spécifiée '%s' ne peut pas être exécutée pour les services"
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr "Service de temps"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
+msgstr "Service NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "La sauvegarde des services du serveur à échoué"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "La sauvegarde des services du serveur à échoué"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
-msgid "The attribute database is empty or contains invalid characters."
+#: plugins/admin/systems/class_goNtpServer.inc:219
+#, fuzzy
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Stopper tout les services"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "La sauvegarde des services du serveur à échoué"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr "La base est vide ou contient des caractères invalides."
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
 msgstr ""
-"l'attribut de la base de données est vide ou contient des caractères "
-"invalides."
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Serveur Ldap"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Serveur Ldap"
 
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
@@ -10733,6 +11915,7 @@ msgid "This value specifies the maximal header size."
 msgstr "Cette valeur spécifié l'entête maximale du message."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr "Taille maximale de la boite de messagerie"
 
@@ -10741,6 +11924,7 @@ msgid "Defines the maximal size of mail box."
 msgstr "Défini la taille maximale du compte de messagerie."
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 msgid "Max message size"
 msgstr "Taille maximale du message"
 
@@ -10749,6 +11933,7 @@ msgid "Specify the maximal size of a message."
 msgstr "Spécifiez la taille maximale d'un message."
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 msgid "Relay host"
 msgstr "Hôte relai"
 
@@ -10757,6 +11942,7 @@ msgid "Relay messages to following host:"
 msgstr "Relayer les messages vers l'hôte suivant:"
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr "Réseau local"
 
@@ -10769,6 +11955,7 @@ msgid "Domains and routing"
 msgstr "Domaines et routages"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr "Domaine desquels accepter des messages"
 
@@ -10789,6 +11976,7 @@ msgid "Restrictions"
 msgstr "Restrictions"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr "Restrictions à l'envoi"
 
@@ -10798,6 +11986,7 @@ msgid "Restriction filter"
 msgstr "Filtre de restriction"
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr "Restrictions sur les destinataires"
 
@@ -10825,133 +12014,32 @@ msgstr "Activer un nouveau statut"
 msgid "Set status"
 msgstr "Activer le statut"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr "Arrêter"
-
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
-msgstr "Démarrer"
-
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
-msgstr "Redémarrer"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr "Impossible d'activer le statut tant que ce serveur n'est pas sauvé"
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr "La méthode spécifiée '%s' ne peut pas être exécutée pour les services"
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Services de terminaux"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-"Serveur de terminaux, le chemin vers les polices de caractère doit être "
-"spécifié."
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 msgid "Start IMAP service"
 msgstr "Démarrer le service IMAP"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 msgid "Start IMAP SSL service"
 msgstr "Démarrer le service IMAP/SSL"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 msgid "Start POP3 service"
 msgstr "Démarrer le service POP3"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 msgid "Start POP3 SSL service"
 msgstr "Démarrer le service POP3/SSL"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
-msgstr "Service de temps"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-msgid "NTP service"
-msgstr "Service NTP"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "La sauvegarde des services du serveur à échoué"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-msgid "The given base is empty or contains invalid characters."
-msgstr "La base est vide ou contient des caractères invalides."
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 msgid "Logging service"
 msgstr "service de gestion des journaux systèmes"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 msgid "Syslog service"
 msgstr "Service des journaux systèmes"
 
@@ -10970,10 +12058,10 @@ msgstr "La sauvegarde des services du serveur à échoué"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "enabled"
-msgstr "activé"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+#, fuzzy
+msgid "Syslog"
+msgstr "Logs systèmes"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 msgid "VoIP service"
@@ -11014,6 +12102,26 @@ msgid ""
 msgstr ""
 "l'attribut préfixe du pays est vide ou contient des caractères invalides."
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Serveur de Police de caractère"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Service Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Enregistrement SOA"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Code du compte téléphonique"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -11029,11 +12137,23 @@ msgstr "La sauvegarde des services du serveur à échoué"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "Information sur la base de données Glpi."
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+#, fuzzy
+msgid "Log"
+msgstr "Identifiant"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "service de gestion des journaux systèmes"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
+msgstr "activé"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 msgid "Kerberos service"
 msgstr "Service Kerberos"
 
@@ -11071,9 +12191,10 @@ msgstr "L'utilisateur admin Kerberos spécifié est vide."
 msgid "The specified kerberos realm is empty."
 msgstr "Le realm Kerberos spécifié est vide."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Information sur la base de données des FAX"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+#, fuzzy
+msgid "Realm"
+msgstr "Mémoire vive"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 msgid "Mail service (SMTP)"
@@ -11111,6 +12232,24 @@ msgstr ""
 msgid "Please specify a numeric value for message size limit."
 msgstr "Veuillez spécifier un nombre pour la taille maximale du message."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Serveur de messagerie"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Transports"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "Information sur la base de données Glpi."
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr "Service IMAP/POP3"
@@ -11159,13 +12298,28 @@ msgstr "Veuillez entrer un mot de passe pour l'administarteur."
 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_goImapServer.inc:186
-msgid "The sieve port needs to be numeric."
-msgstr "Le port sieve doit être numérique."
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
+msgstr "Le port sieve doit être numérique."
+
+#: plugins/admin/systems/class_goImapServer.inc:273
+#, fuzzy
+msgid "Imap"
+msgstr "Importer"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Serveur Imap"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Mot de passe administrateur"
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Information sur la base de données des journaux systèmes"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Information sur la base de données des FAX"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 msgid "File service"
@@ -11201,6 +12355,20 @@ msgstr "La suppression du conteneur pour les points de montage à échoué"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "La sauvegarde du conteneur pour les points de montage à échoué"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Démarrer le service"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nouvelle entrée"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr "Information sur la base de données des journaux systèmes"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11225,6 +12393,7 @@ msgid "Phone queue"
 msgstr "Queue téléphonique"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "Système"
 
@@ -11241,6 +12410,11 @@ msgstr "Il doit y avoir au moins un serveur NTP sélectionné."
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "La suppression des paramètres de messagerie pour le groupe à échoué"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Statut du système"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Sélectionner pour voir les départements"
@@ -11298,6 +12472,7 @@ msgid "Display objects of department"
 msgstr "Afficher les objets du département"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Groupes d'objets"
@@ -11382,6 +12557,16 @@ msgstr "La sauvegarde du groupe d'objets à échoué"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "La suppression du groupe d'objet à échoué"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Groupes d'objets"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Membres"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11409,6 +12594,7 @@ msgid "Generic queue Settings"
 msgstr "Paramètres par défaut des queues"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Temps d'attente maximum"
 
@@ -11437,6 +12623,7 @@ msgid "Use music on hold instead of ringing"
 msgstr "Mettre de la musique lorsqu'on est en attente plutôt que la sonnerie"
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr "Musique d'attente"
 
@@ -11485,26 +12672,32 @@ msgid "Phone attributes "
 msgstr "Propriétés du téléphone"
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr "Annonce de la durée de mise en attente"
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr "Permettre à l'utilisateur appelé de transférer son appel"
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr "Permettre à l'utilisateur qui appelle de transférer son appel"
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr "Sonner au lieu de mettre un musique d'ambiance"
 
@@ -11540,6 +12733,11 @@ msgstr "La sauvegarde du groupe d'objets à échoué"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "La suppression du groupe d'objet à échoué"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Groupe principal"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "Tout faire sonner"
@@ -11678,6 +12876,75 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "La suppression des paramètres de messagerie pour le groupe à échoué"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Les membres sont dans un groupe téléphonique"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Taille maximale de la queue"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Fréquence du message d'annonce"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Bienvenue %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+#, fuzzy
+msgid "Report hold time"
+msgstr "Annonce de la durée de mise en attente"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+#, fuzzy
+msgid "'There are' sound"
+msgstr "'Il y a ...'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+#, fuzzy
+msgid "'Call waiting' sound"
+msgstr "'... appels en attente'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "Message 'Merci'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "'minutes' du fichier son"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Second' sound"
+msgstr "'secondes' du fichier son"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Fichier son, moins de"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Numéro de téléphone"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Message de présentation"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11870,12 +13137,50 @@ msgstr "Installation entièrement automatique (FAI)"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Créer un nouveau script de base FAI à échoué"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Importez un script"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Chemin du Script"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "La sauvegarde du modèle FAI de base à échoué"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nouveau modèle"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Ensemble de modèles"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Nom du modèle"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Nom du fichier"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Permissions"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11914,6 +13219,16 @@ msgstr "Le branche spécifiée est invalide."
 msgid "Specified freeze name is invalid."
 msgstr "Le nom utilisé pour le verrouillage est invalide."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Gestion"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Configuration de Glpi"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Méthode d'installation"
@@ -12050,71 +13365,108 @@ msgstr "Le paquets '%s' n'existe pas."
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "La sauvegarde du package FAI de base à échoué"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquet"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Liste des paquets"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Méthode d'installation"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr "Cette liste affiche toute les classes appartenant à ce profile."
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Ensemble de connections"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Ensemble de modèles"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Ensemble de scripts"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Ensemble de variables"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr "Ensemble de paquets"
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Table des partitions"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr "Enlever la classe du profil"
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 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:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Veuillez entrer un nom valide."
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr "Il y a déjà un profil avec ce nom de classe."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "La sauvegarde du profile FAI à échoué"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Profils"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Nouveau profil"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "La sauvegarde du hook de base FAI à échoué"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "Classes FAI"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "Connexions"
+
+#: plugins/admin/fai/class_faiHook.inc:475
+#, fuzzy
+msgid "FAI hook"
+msgstr "Afficher les hooks FAI"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Tâche"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -12131,6 +13483,7 @@ msgid "FS type"
 msgstr "FS type"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Point de montage"
@@ -12141,6 +13494,7 @@ msgid "Size in MB"
 msgstr "Taille en MB"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Options de montage"
@@ -12229,6 +13583,7 @@ msgid "Variable attributes"
 msgstr "Attributs des variables"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Contenu de la variable"
 
@@ -12265,6 +13620,41 @@ msgstr "partition(s) %s "
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "LA sauvegarde de la table de partition FAI à échoué"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nouvelle table des partitions"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Table des partitions"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Partitions"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Type de système"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Partitions"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "voir les informations sur le système"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partitions"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Veuillez entrer une valeur pour le script."
@@ -12282,10 +13672,6 @@ msgstr "Nom de la classe"
 msgid "Hook attributes"
 msgstr "Attributs des connections"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Tâche"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr "Choisissez une tâche FAI existante"
@@ -12373,6 +13759,11 @@ msgstr "Un nouveau nom de classe."
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "La sauvegarde de la variable de base FAI à échoué"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Afficher les variables FAI"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "pas encore de fichier téléchargé"
@@ -12423,6 +13814,7 @@ msgid "Destination path"
 msgstr "Répertoire de destination"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Propriétaire"
@@ -12489,10 +13881,6 @@ msgstr ""
 "Ce menu vous permet de sélectionner de multiples paquets à ajouter a la "
 "liste en cours d'édition."
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paquet"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12777,6 +14165,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Veuillez entrer un nom pour la conférence."
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Groupe principal"
@@ -12800,6 +14189,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtres"
@@ -12881,11 +14271,27 @@ msgstr "Une application ayant le même 'Nom' existe déjà."
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "type mime"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "type mime"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Créer des applications"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Applications utilisées"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -13106,6 +14512,37 @@ msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "La suppression du compte téléphonique à échoué"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Configuration du téléphone"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Méthodes de distribution"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Téléphone"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#, fuzzy
+msgid "Voivemail pin"
+msgstr "Code PIN de la boite vocale"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Numéro de téléphone"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Paramètres de messagerie"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13260,6 +14697,20 @@ msgstr "Veuillez choisir une base valide."
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "La sauvegarde duc ompte oxchange à échoué"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Administration d'Asterisk"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Texte de la macro"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr "Argument"
@@ -13382,6 +14833,7 @@ msgid "Lifetime (in days)"
 msgstr "Durée (en jours)"
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr "Code PIN préselectionné"
 
@@ -13391,6 +14843,7 @@ msgid "PIN"
 msgstr "Code PIN"
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr "Enregistrer la conférence"
 
@@ -13399,6 +14852,7 @@ msgid "Sound file format"
 msgstr "Format du fichier son "
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr "Musique d'attente"
 
@@ -13415,13 +14869,10 @@ msgid "Count users"
 msgstr "Compter les utilisateurs"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Conférences téléphoniques"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Gestion"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13465,6 +14916,50 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Gestion des conférences"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Conférence"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Activer le menu de session"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#, fuzzy
+msgid "Announce user activity"
+msgstr "Fréquence du message d'annonce"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Compter les utilisateurs"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Nom de la conférence"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "format"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#, fuzzy
+msgid "Lifetime"
+msgstr "Durée (en jours)"
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "Gestion des conférences"
@@ -13506,6 +15001,9 @@ msgid "Duration"
 msgstr "Durée"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Rapports téléphoniques"
 
@@ -13917,14 +15415,14 @@ msgstr "L'effacement à été interrompu par l'extension '%s': %s"
 msgid "References"
 msgstr "Références"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le CHECK de l'extension '%s' n'existe pas."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -13932,7 +15430,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -13940,7 +15438,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -13948,62 +15446,62 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "L'objet '%s' est déjà marqué"
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Ajouter une marque (%s) à l'objet '%s'"
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Suppression de la marque de l'objet '%s'"
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "La sauvegarde du groupe d'objets à échoué"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "La suppression du téléphone à échoué"
@@ -14013,7 +15511,7 @@ msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 "Impossible d'utiliser ssha pour le cryptage (Fonction mhash / sha1 manquante)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -14021,12 +15519,12 @@ msgstr ""
 "Votre fichier de configuration gosa.conf à changé partiellement . Veuillez "
 "le convertir en utilisant le script fix_config.sh!"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -14103,7 +15601,7 @@ msgstr "La lecture du fichier PPD %s à échoué - pas de données."
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
@@ -14664,7 +16162,7 @@ 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:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14789,120 +16287,120 @@ msgstr ""
 msgid "Access control"
 msgstr "Options d'accès"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Log Level"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Créer un nouvel objet FAI"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "ignorer les sous arbres"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Editer"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Supprimer"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Editer la classe"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Créer un nouvel objet FAI"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Objets membres"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Objets membres"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Objets membres"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Objets membres"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Statut FAI inconnu %s"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Membres"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "La sauvegarde des informations ACL à échoué"
@@ -15009,27 +16507,27 @@ msgstr "Impossible d'ouvrir '%s', le fichier n'existe probablement pas."
 msgid "Can't read file '%s', check permissions."
 msgstr "Impossible de lire le fichier '%s', vérifiez les permissions"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "Le fichier de configuration %s/gosa.conf ne peut être lu. Abandon."
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation n'est pas "
 "accessible!"
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -15037,30 +16535,30 @@ 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:224
+#: html/index.php:232
 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:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Le nom d'utilisateur est incorrect!"
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passe!"
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr "Compte Vérrouillé. Veuillez contacter votre administrateur système."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15392,10 +16890,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN de l'administrateur"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Mot de passe administrateur"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15705,8 +17199,36 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Taille des Quota"
+#~ msgid "Day"
+#~ msgstr "jour"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Sélectionnez le modèle du clavier"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Sélectionnez la variante du clavier"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Volume"
+
+#, fuzzy
+#~ msgid "Technical responsilbe"
+#~ msgstr "Responsable technique"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Identifiant du serveur"
+
+#~ 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'."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Certificat standard"
 
 #, fuzzy
 #~ msgid "Vocation message"

diff --git a/locale/it/LC_MESSAGES/messages.mo b/locale/it/LC_MESSAGES/messages.mo
index 2116474d2bd617fe9af89973e9187d95c7b2c628..50b0b70cfa6fff839df012e3f93bc0813dc23177 100644 (file)
Binary files a/locale/it/LC_MESSAGES/messages.mo and b/locale/it/LC_MESSAGES/messages.mo differ

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 5ad1acef61f5a87ed42137f1c7db81c83f6ece50..a259106c7fb6f537ac77d35ad60f342f89e102e5 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,13 +2,15 @@
 # Copyright (c) 2005 B-Open Solutions srl - http://www.bopen.it/
 # Copyright (c) 2005 Alessandro Amici <a.amici@bopen.it>
 # Alessandro Amici <a.amici@bopen.it>, 2005.
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -17,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Identità"
 
@@ -26,6 +28,7 @@ msgid "Administration"
 msgstr "Amministrazione"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Extra"
 
@@ -37,18 +40,29 @@ msgstr "Extra"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -58,7 +72,9 @@ msgstr "Extra"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Generale"
@@ -69,6 +85,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -76,16 +93,21 @@ msgstr "Ambiente"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Posta"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -100,23 +122,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Connettività"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -128,16 +155,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefono"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -161,6 +191,8 @@ msgid "Parameter"
 msgstr "Parametro"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Avvio"
@@ -172,8 +204,9 @@ msgstr "Dispositivi"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -243,6 +276,7 @@ msgstr "Partizioni"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -270,7 +304,7 @@ msgstr "Profili"
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Pacchetti"
 
@@ -386,7 +420,7 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -432,12 +466,12 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -493,9 +527,9 @@ msgstr "Aggiungi"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -519,8 +553,8 @@ msgstr "Aggiungi"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -531,8 +565,8 @@ msgstr "Aggiungi"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -566,6 +600,7 @@ msgstr "Indirizzo principale"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -589,8 +624,9 @@ msgid "not defined"
 msgstr "non definito"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Dimensione quota"
 
@@ -709,14 +745,14 @@ msgstr "Rifiuta mail più grandi di"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Messaggio di di risposta automatica"
 
@@ -747,7 +783,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "L'utente è abilitato a mandare e ricevere solo mail locali"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Usa uno script di sieve personalizzato"
 
@@ -767,7 +803,7 @@ msgstr "disabilita tutte le opzioni di posta!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -817,7 +853,7 @@ msgid "User mail settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -873,60 +909,60 @@ msgstr "Questo fa qualcosa"
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "Il metodo di posta '%s' non è definito in gosa.conf"
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, fuzzy, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Rimuovi"
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Questa identità non ha le estensioni per la posta"
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crea estensioni di posta"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Stai tentandi di aggiungere un indirizzo di posta non valido alla lista "
 "degli inoltri"
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Aggiungere il tuo indirizzo alla lista delgi inoltri non ha senso."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -935,129 +971,134 @@ msgstr ""
 "Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
 "indirizzi alternativi."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "Il valore di 'Dimensione quota' non è valido"
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Devi specificare la dimensione massima delle mail da rigettare."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
 msgid "Mail server"
 msgstr "Server"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "Inoltra i messaggi a"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Indirizzo principale"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Rifiuta mail più grandi di"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Indirizzi alternativi"
@@ -1144,10 +1185,15 @@ msgstr "Indietro"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1206,8 +1252,8 @@ msgid "External password changer reported a problem: "
 msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1215,16 +1261,17 @@ msgid "Home directory"
 msgstr "Home directory"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Gruppo primario"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1244,6 +1291,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1262,7 +1310,7 @@ msgid "Account"
 msgstr "Sicurezza"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Accesso ai sistemi"
 
@@ -1644,53 +1692,53 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "Estenzioni FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Mostra telefoni"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostra persone"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Accesso ai sistemi"
@@ -1723,7 +1771,7 @@ msgid "Allow user to change password from client"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "L'accesso ai client Windows non richiede password"
 
@@ -1732,7 +1780,7 @@ msgid "Temporary disable samba account"
 msgstr "Disabilita temporaneamente l'account Samba"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Dominio"
 
@@ -1741,12 +1789,12 @@ msgid "Terminal Server"
 msgstr "Terminal Server"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Permetti la connessione al Terminal Server"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Eredita la configurazione del client"
 
@@ -1811,17 +1859,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Blocca l'account samba"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Limita il tempo per la connessione"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Limita il tempo per la disconnessione"
 
@@ -1834,7 +1882,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Impostazioni Samba"
 
@@ -1950,41 +1998,41 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Account Kolab"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "L'account spira dopo"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "La password spira il"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Home directory"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Script path"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Path del profilo"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permetti la connessione solo da queste workstation"
@@ -2026,171 +2074,167 @@ msgstr "invalido"
 msgid "No certificate installed"
 msgstr "Non ci sono certificati installati"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Elimina estensioni Unix"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Estenzioni Proxy Internet"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Ruolo"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2201,69 +2245,111 @@ msgstr "CAP"
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Utenti"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Base"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Nuova password"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Titolo di studio"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2276,111 +2362,118 @@ msgstr "Organizzazione"
 msgid "Department"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Generale"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Località"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Stato"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+#, fuzzy
+msgid "User picture"
+msgstr "Foto personale"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Certificato standard"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Certificato standard"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Cambia foto"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
@@ -2388,12 +2481,12 @@ msgstr "Cambia foto"
 msgid "Last name"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 #, fuzzy
 msgid "Template name"
 msgstr "Template"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
@@ -2401,66 +2494,32 @@ msgstr "Template"
 msgid "First name"
 msgstr "Liste di blocco"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Nome utente"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Imposta"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sesso"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Scegli il subtree per l'utente"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2485,67 +2544,69 @@ msgstr "Scegli il subtree per l'utente"
 msgid "Select a base"
 msgstr "Rimuovi"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Indirizzo"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Telefono privato"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificati"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Modifica certificati"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Modifica proprietà"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Matricola"
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2553,7 +2614,7 @@ msgstr "Cellulare"
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Usa il tab del telefono"
 
@@ -2590,8 +2651,8 @@ msgstr "Elimina foto"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2620,7 +2681,7 @@ msgstr "Certificato standard"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2655,11 +2716,6 @@ msgstr "Numero seriale del certificato"
 msgid "User settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-#, fuzzy
-msgid "User picture"
-msgstr "Foto personale"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 #, fuzzy
 msgid "Clear password"
@@ -2725,6 +2781,7 @@ msgid "Temporary disable FTP access"
 msgstr "Disabilita temporaneamente l'accesso FTP"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Estenzioni Proxy Internet"
 
@@ -2737,6 +2794,7 @@ msgid "Limit proxy access to working time"
 msgstr "Limita l'accesso a Internet alle ore lavorative"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Restringi la quota d'uso di Internet"
 
@@ -2748,16 +2806,39 @@ msgstr "per"
 msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Impostazioni FAX"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "L'account spira dopo"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Sicurezza"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Estenzioni PHPGroupware"
@@ -2774,6 +2855,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr ""
 
@@ -2809,134 +2891,198 @@ msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr "L'indirizzo che stai cercando di aggiungere è già in uso"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Manuale"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Elimina estensioni Samba"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Account Kolab"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Account Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Informazioni generali"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Estenzioni WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Estenzioni WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Estenzioni WebDAV"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "Tipo"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Crea estensioni FAX"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Dimensione quota"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Banda di upload"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Dimensione quota"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Scarica il file di  configurazione"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Banda di upload"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Banda di download"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -2966,48 +3112,75 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 #, fuzzy
 msgid "Couldn't connect to postgresql database!"
 msgstr "Impossibile connettersi al server del database!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Elimina estensioni telefoniche"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+msgid "OXAppointmentDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "disabilitato"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+msgid "OXTimeZone"
+msgstr ""
+
 #: plugins/personal/connectivity/intranet.tpl:3
 #, fuzzy
 msgid "Intranet account"
@@ -3017,97 +3190,148 @@ msgstr "Crea estensioni telefoniche"
 msgid "This account has no connectivity extensions."
 msgstr "Questa identità non possiede estensioni di connettività"
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Connettività"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Connettività"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "ora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "giorno"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "settimana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "mese"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Elimina estensioni Unix"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 #, fuzzy
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Il valore di 'Dimensione quota' non è valido"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Estenzioni Proxy Internet"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Limita l'accesso a Internet alle ore lavorative"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Path del profilo"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Opzioni applicazione"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 #, fuzzy
 msgid "PPTP account"
 msgstr "Estenzioni FTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Crea estensioni telefoniche"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Crea estensioni telefoniche"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 #, fuzzy
 msgid "GLPI account"
 msgstr "Estenzioni FTP"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Estenzioni FTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 #, fuzzy
 msgid "Opengroupware"
 msgstr "Estenzioni PHPGroupware"
@@ -3134,6 +3358,7 @@ msgid "Teams"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 #, fuzzy
 msgid "PHPscheduleit account"
 msgstr "Estenzioni PHPGroupware"
@@ -3143,39 +3368,59 @@ msgstr "Estenzioni PHPGroupware"
 msgid "PHPscheduleit"
 msgstr "Estenzioni PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Estenzioni PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Estenzioni PHPGroupware"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "Estenzioni PHPGroupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "Estenzioni PHPGroupware"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
 msgstr "Estenzioni PHPGroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Estenzioni PHPGroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Estenzioni PHPGroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -3213,7 +3458,7 @@ msgid "Profil quota"
 msgstr "Path del profilo"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr ""
 
@@ -3223,7 +3468,7 @@ msgid "Kiosk profile settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr ""
 
@@ -3233,24 +3478,26 @@ msgid "Manage"
 msgstr "Nome gruppo"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 #, fuzzy
 msgid "Shares"
 msgstr "reset"
@@ -3512,27 +3759,31 @@ msgid "Administrator"
 msgstr "Amministrazione"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 #, fuzzy
 msgid "Default printer"
 msgstr "Permessi predefiniti"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Server"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Path del profilo"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3586,28 +3837,51 @@ msgstr "Script path"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3644,7 +3918,7 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3743,36 +4017,43 @@ msgid "Nagios Account"
 msgstr "Contatto"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 #, fuzzy
 msgid "Alias"
 msgstr "Italiano"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 #, fuzzy
 msgid "Host notification period"
 msgstr "Opzioni applicazione"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 #, fuzzy
 msgid "Service notification period"
 msgstr "Opzioni applicazione"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 #, fuzzy
 msgid "Service notification options"
 msgstr "Opzioni applicazione"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 #, fuzzy
 msgid "Host notification options"
 msgstr "Opzioni applicazione"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 #, fuzzy
 msgid "Service notification commands"
 msgstr "Opzioni applicazione"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 #, fuzzy
 msgid "Host notification commands"
 msgstr "Opzioni applicazione"
@@ -3867,6 +4148,44 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+msgid "View all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Dispositivi del client"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Informazioni organizzazione"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Dispositivi del client"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Informazioni organizzazione"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Informazioni organizzazione"
+
 #: plugins/personal/nagios/main.inc:124
 #, fuzzy
 msgid "Nagios settings"
@@ -3926,6 +4245,19 @@ msgstr "Crea estensioni telefoniche"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Home directory"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 #, fuzzy
 msgid "Share"
@@ -3933,6 +4265,7 @@ msgstr "reset"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr ""
 
@@ -3950,13 +4283,16 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3980,7 +4316,46 @@ msgstr ""
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Attenzione"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+#, fuzzy
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
+"i> per abortire."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr ""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Liste blocco FAX"
 
@@ -4010,69 +4385,95 @@ msgstr "ricevi"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Elimina estensioni per le applicazioni"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Nome applicazione"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Attenzione"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Liste blocco FAX"
 
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Cognome"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
 #, fuzzy
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
-"i> per abortire."
-
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr ""
+msgid "Blocklist type"
+msgstr "Liste di blocco"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4214,12 +4615,12 @@ msgstr "Sali di dipartimento"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr ""
 
@@ -4355,7 +4756,7 @@ msgstr "Imposta dipartimento"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "modifica"
 
@@ -4383,7 +4784,7 @@ msgstr "Modifica contatto"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "elimina"
 
@@ -4399,7 +4800,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Lingua"
@@ -4409,6 +4812,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato di recapito"
 
@@ -4433,6 +4837,7 @@ msgid "Deliver fax as mail"
 msgstr "Recapita Fax come mail"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Recapita Fax alla stampante"
 
@@ -4568,6 +4973,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Estenzioni Proxy Internet"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Impostazioni Samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Lista delle liste di blocchi"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Liste di blocco"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4725,39 +5149,16 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Cognome"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Rapporti FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Dispositivi del client"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4882,7 +5283,7 @@ msgstr "Città"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Paese"
 
@@ -5599,7 +6000,8 @@ msgid "Notifications"
 msgstr "Località"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Gruppi di utenti"
@@ -5681,12 +6083,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5812,6 +6214,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Impostazioni generali delle code"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "I membri sono in un gruppo di risposta telefonica"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Contatto"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Membri del gruppo"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Gruppo Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 #, fuzzy
 msgid "Release focus"
@@ -5835,7 +6267,8 @@ msgstr "Aggiungi contatto"
 msgid "Available applications"
 msgstr "Applicazioni disponibili"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "leggere"
 
@@ -5851,7 +6284,8 @@ msgstr "spedire esterno"
 msgid "append"
 msgstr "appendere"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "scrivere"
 
@@ -5892,6 +6326,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Prego inserire un numero di telefono valido!"
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nome gruppo"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Indirizzi alternativi"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Indirizzo principale"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Permessi"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Amministratori cartella"
@@ -5984,18 +6439,6 @@ msgstr "Mostra utenti del dipartimento"
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opzioni applicazione"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostra l'indirizzo del dipartimento"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostra gli indirizzi che corrispondono"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -6105,6 +6548,40 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Mostra applicazioni"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Applicazione"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nome applicazione"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opzioni applicazione"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostra l'indirizzo del dipartimento"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostra gli indirizzi che corrispondono"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 #, fuzzy
 msgid "Group settings"
@@ -6193,14 +6670,6 @@ msgstr "Crea estensioni telefoniche"
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Applicazione"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6308,6 +6777,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr ""
 
@@ -6482,7 +6952,9 @@ msgid "Application name"
 msgstr "Nome applicazione"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Mostra il nome"
 
@@ -6492,6 +6964,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6511,7 +6984,9 @@ msgid "Choose subtree to place application in"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icna"
 
@@ -6525,22 +7000,27 @@ msgid "Reload picture from LDAP"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -6579,6 +7059,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr ""
 
@@ -6682,6 +7163,20 @@ msgstr "Nome applicazione"
 msgid "Application settings"
 msgstr "Opzioni applicazione"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nome applicazione"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Mostra terminali"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6748,6 +7243,7 @@ msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr ""
 
@@ -6781,6 +7277,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 #, fuzzy
 msgid "Administrative settings"
 msgstr "Amministrazione"
@@ -6790,10 +7287,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -6837,69 +7334,84 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Imposta dipartimento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Imposta dipartimento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Oggetto"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Dipartimenti"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Telefono"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+#, fuzzy
+msgid "Department name"
+msgstr "Dipartimento"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6915,21 +7427,6 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Telefono"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-#, fuzzy
-msgid "Department name"
-msgstr "Dipartimento"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6983,6 +7480,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6997,6 +7495,8 @@ msgstr "telefoni"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7063,11 +7563,14 @@ msgid "Terminal Service"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr ""
@@ -7235,8 +7738,11 @@ msgstr "Scegli il subtree dove mettere i terminali"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr ""
 
@@ -7248,7 +7754,9 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr ""
 
@@ -7259,6 +7767,7 @@ msgid "Choose server to use for logging"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr ""
 
@@ -7267,6 +7776,7 @@ msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr ""
 
@@ -7416,6 +7926,121 @@ msgstr ""
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Informazioni organizzazione"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Servizi"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Terminal Server"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Dimensione quota"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "metodo"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Server"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+msgid "Vsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Nome della stampante"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "disabilitato"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "disabilitato"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Monitoraggio"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Dispositivo telefonico"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7429,6 +8054,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Opzioni di posta dell'identità"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Terminali"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Server"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Parametro"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr ""
@@ -7446,6 +8094,7 @@ msgid "Workstation template"
 msgstr ""
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr ""
 
@@ -7476,10 +8125,6 @@ msgstr "URL della stampante"
 msgid "Driver"
 msgstr "Driver"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Permessi"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr ""
@@ -7594,6 +8239,39 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminali"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Terminal Server"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Mostra server"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Azione"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7665,6 +8343,17 @@ msgstr ""
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Cognome"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "nella cartella"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr ""
@@ -7715,6 +8404,25 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Stampante"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Mostra workstation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Servizi"
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Sistemi"
@@ -7770,23 +8478,9 @@ msgstr ""
 msgid "New System from incoming"
 msgstr "Informazioni organizzazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Terminal"
-msgstr "Terminali"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:761
-msgid "Workstation is installing"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "Workstation is installing"
+msgstr ""
 
 #: plugins/admin/systems/class_systemManagement.inc:762
 msgid "Workstation is waiting for action"
@@ -7839,6 +8533,7 @@ msgid "Zones"
 msgstr "telefoni"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 #, fuzzy
 msgid "Postfix mydomain"
 msgstr "nel dominio"
@@ -7849,22 +8544,27 @@ msgid "Postfix mydestination"
 msgstr "Impostazioni Unix"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr ""
 
@@ -7881,6 +8581,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr ""
 
@@ -7893,6 +8594,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
@@ -7917,6 +8619,7 @@ msgid "Host used to relay mails"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
@@ -7951,6 +8654,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Riferimenti"
@@ -7989,10 +8693,54 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
 msgid "DNS service"
 msgstr "Mostra dispositiva di rete"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Nome comune"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "server"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "Terminali"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Riprova"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+#, fuzzy
+msgid "Expire"
+msgstr "Esporta"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone records"
+msgstr "Directory"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -8004,6 +8752,7 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr ""
 
@@ -8040,16 +8789,19 @@ msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr ""
 
@@ -8071,6 +8823,7 @@ msgid "Glpi database"
 msgstr "Database"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 #, fuzzy
 msgid "Database"
@@ -8080,6 +8833,76 @@ msgstr "Database"
 msgid "Machine name"
 msgstr ""
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "server"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Scarica il file di  configurazione"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Server"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nome locazione"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -8141,6 +8964,39 @@ msgstr "Utenti di Dominio"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Destinazione"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Server"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Rimuovi"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Server"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8254,6 +9110,20 @@ msgstr ""
 msgid "Group"
 msgstr "Gruppo"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Stampante"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Stampante"
+
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
 msgid ""
@@ -8300,6 +9170,57 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+msgid "Component generic"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Server Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Creare"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
 msgid "Time server"
@@ -8311,6 +9232,7 @@ msgid "Printer type"
 msgstr "Nome della stampante"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8324,6 +9246,7 @@ msgstr "Nome della stampante"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -8333,11 +9256,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "Terminali"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr ""
@@ -8352,11 +9270,15 @@ msgid "Contacts"
 msgstr "Contatto"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 #, fuzzy
 msgid "Contact person"
 msgstr "Contatto"
@@ -8371,48 +9293,6 @@ msgstr "Argomenti"
 msgid "Installed cartridges"
 msgstr "Dispositivi del client"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Server Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Creare"
-
 #: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
 msgid "Edit share"
@@ -8423,6 +9303,7 @@ msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
 #, fuzzy
 msgid "Volume"
 msgstr "Home"
@@ -8437,6 +9318,7 @@ msgid "Codepage"
 msgstr "Home Page"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 #, fuzzy
 msgid "Option"
 msgstr "Opzioni"
@@ -8448,11 +9330,13 @@ msgid "System type"
 msgstr "Sistemi"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 #, fuzzy
 msgid "Operating system"
 msgstr "Rimuovi"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8553,6 +9437,35 @@ msgstr ""
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Numero di telefono"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Dispositivo telefonico"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Stampante predefinita"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8598,6 +9511,20 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 msgid "Option contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "reset"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8650,12 +9577,42 @@ msgid ""
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/class_workstationStartup.inc:1083
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Opzioni di posta avanzate"
+msgid "System startup"
+msgstr "Accesso ai sistemi"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Parametro"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+#, fuzzy
+msgid "FAI classes"
+msgstr "Scegli il tuo numero di telefono personale"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Password attuale"
+
+#: plugins/admin/systems/phonesettings.tpl:1
+#, fuzzy
+msgid "Advanced phone settings"
+msgstr "Opzioni di posta avanzate"
+
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
 msgid "Phone type"
 msgstr "Telefono"
@@ -8675,10 +9632,6 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr ""
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 #, fuzzy
@@ -8817,6 +9770,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 #, fuzzy
 msgid "Section"
 msgstr "Azione"
@@ -8847,6 +9801,7 @@ msgstr "Stampante"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr ""
 
@@ -8897,6 +9852,11 @@ msgstr "Impostazioni Unix"
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Stampante"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "server"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8947,13 +9907,6 @@ msgstr ""
 msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Dispositivo telefonico"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -9023,11 +9976,6 @@ msgstr ""
 msgid "Boot parameters"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr ""
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -9055,7 +10003,9 @@ msgstr "server"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 #, fuzzy
 msgid "Release"
@@ -9112,10 +10062,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr ""
@@ -9152,10 +10098,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -9165,12 +10107,14 @@ msgid "Select scanner driver to use"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
 msgid "Repository"
 msgstr "Riprova"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 #, fuzzy
 msgid "Parent server"
 msgstr "server"
@@ -9200,6 +10144,7 @@ msgstr "Impossibile connettersi al server del database!"
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
 msgid "Repository service"
 msgstr "server"
@@ -9229,6 +10174,15 @@ msgstr "L'indirizzo principale inserito è già in uso."
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Rimuovi"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
 msgid "List of configured repositories."
@@ -9243,6 +10197,54 @@ msgstr "Riprova"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "Database"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Riferimenti"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Server"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "DN dell'amministratore"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 #, fuzzy
 msgid "Manage System-types"
@@ -9393,6 +10395,103 @@ msgstr ""
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Elimina foto"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Argomenti"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Argomenti"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Argomenti"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Argomenti"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Dispositivi"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Seleziona il numero da aggiungere"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Nuova password"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Dispositivi"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Server"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Dispositivi"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Nuova conferenza"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+msgid "Device graphics card"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+msgid "Device power supply"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Mostra dispositiva di rete"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
 msgid "Manage manufacturers"
@@ -9435,6 +10534,7 @@ msgstr "Modifica contatto"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 #, fuzzy
 msgid "Comments"
@@ -9584,6 +10684,7 @@ msgid "Add/Edit network interface"
 msgstr "Mostra stampanti di rete"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 #, fuzzy
 msgid "MAC address"
 msgstr "Indirizzo principale"
@@ -9948,6 +11049,31 @@ msgstr ""
 msgid "since"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Elimina foto"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Opzioni di posta dell'identità"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -10018,6 +11144,21 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Impostazioni Samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Directory"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "Indirizzo principale"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -10055,21 +11196,11 @@ msgstr "Espressione regolare per selezionare l'indirizzo"
 msgid "Reference"
 msgstr "Riferimenti"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-#, fuzzy
-msgid "Zone name"
-msgstr "Nome comune"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
 msgid "Network address"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-#, fuzzy
-msgid "Zone records"
-msgstr "Directory"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -10087,17 +11218,6 @@ msgstr ""
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Riprova"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-#, fuzzy
-msgid "Expire"
-msgstr "Esporta"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 #, fuzzy
 msgid "MxRecords"
@@ -10139,7 +11259,7 @@ msgstr "Gruppo di oggetti"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
@@ -10500,60 +11620,30 @@ msgstr "Seleziona il numero da aggiungere"
 msgid "All available services are already in use."
 msgstr "L'indirizzo principale inserito è già in uso."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-#, fuzzy
-msgid "FAX service"
-msgstr "server"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-#, fuzzy
-msgid "FAX database configuration"
-msgstr "Scarica il file di  configurazione"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
+#: plugins/admin/systems/class_goCupsServer.inc:206
 #, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
-#, fuzzy, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
+msgid "Cups"
+msgstr "gruppi"
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr ""
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Server"
 
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:27
@@ -10561,6 +11651,25 @@ msgstr ""
 msgid "LDAP service"
 msgstr "Dispositivi"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 #, fuzzy
@@ -10655,36 +11764,100 @@ msgstr "Modifica contatto"
 msgid "Remove service"
 msgstr "Elimina contatto"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
 #, fuzzy
-msgid "Inventory database"
-msgstr "Database"
+msgid "Start"
+msgstr "Avvio"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
+#: plugins/admin/systems/class_serverService.inc:9
 #, fuzzy
-msgid "Glpi management"
-msgstr "Riferimenti"
+msgid "Restart"
+msgstr "Riprova"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goNtpServer.inc:219
 #, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Servizi"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Server"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Server"
+
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
 msgstr ""
@@ -10702,6 +11875,7 @@ msgid "This value specifies the maximal header size."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr ""
 
@@ -10710,6 +11884,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 #, fuzzy
 msgid "Max message size"
 msgstr "Inoltra i messaggi a"
@@ -10719,6 +11894,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 #, fuzzy
 msgid "Relay host"
 msgstr "Rimuovi"
@@ -10728,6 +11904,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10742,6 +11919,7 @@ msgid "Domains and routing"
 msgstr "Amministratori di Dominio"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10763,6 +11941,7 @@ msgid "Restrictions"
 msgstr "Azione"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr ""
 
@@ -10773,6 +11952,7 @@ msgid "Restriction filter"
 msgstr "Cerca"
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -10798,138 +11978,33 @@ msgstr "Stato"
 msgid "Set status"
 msgstr "Stato"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-#, fuzzy
-msgid "Start"
-msgstr "Avvio"
-
-#: plugins/admin/systems/class_serverService.inc:9
-#, fuzzy
-msgid "Restart"
-msgstr "Riprova"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Terminal Server"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 msgid "Start IMAP service"
 msgstr ""
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 msgid "Start IMAP SSL service"
 msgstr ""
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 msgid "Start POP3 service"
 msgstr ""
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 msgid "Start POP3 SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-#, fuzzy
-msgid "Time service"
-msgstr "Utenti di Dominio"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
-msgid "NTP service"
-msgstr "Mostra dispositiva di rete"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-#, fuzzy
-msgid "The given base is empty or contains invalid characters."
-msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 #, fuzzy
 msgid "Logging service"
 msgstr "Utenti di Dominio"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 #, fuzzy
 msgid "Syslog service"
 msgstr "Mostra server"
@@ -10949,11 +12024,10 @@ msgstr "Crea estensioni telefoniche"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/class_goSyslogServer.inc:204
 #, fuzzy
-msgid "enabled"
-msgstr "disabilitato"
+msgid "Syslog"
+msgstr "Log di sitema"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 #, fuzzy
@@ -10992,6 +12066,26 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "server"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Directory"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Sicurezza"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -11007,12 +12101,24 @@ msgstr "Crea estensioni telefoniche"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
+#: plugins/admin/systems/class_goLogDBServer.inc:215
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Informazioni generali"
+msgid "Log"
+msgstr "Nome utente"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "disabilitato"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 #, fuzzy
 msgid "Kerberos service"
 msgstr "Kerberos"
@@ -11052,10 +12158,10 @@ msgstr "La password immessa come 'Nuova password' è vuota"
 msgid "The specified kerberos realm is empty."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: plugins/admin/systems/goFaxServer.tpl:1
+#: plugins/admin/systems/class_goKrbServer.inc:228
 #, fuzzy
-msgid "FAX database information"
-msgstr "Informazioni organizzazione"
+msgid "Realm"
+msgstr "Cognome"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 #, fuzzy
@@ -11092,10 +12198,28 @@ msgstr "Specificare una dimenzione valida per le mail da rigettare."
 msgid "Please specify a numeric value for mailbox size limit."
 msgstr "Specificare una dimenzione valida per le mail da rigettare."
 
-#: plugins/admin/systems/class_goMailServer.inc:627
+#: plugins/admin/systems/class_goMailServer.inc:627
+#, fuzzy
+msgid "Please specify a numeric value for message size limit."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
+
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Server"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+msgid "Transport table"
+msgstr ""
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
 #, fuzzy
-msgid "Please specify a numeric value for message size limit."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
+msgid "GLPI database information"
+msgstr "Informazioni generali"
 
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
@@ -11155,9 +12279,24 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
+#: plugins/admin/systems/class_goImapServer.inc:273
 #, fuzzy
-msgid "Logging database information"
+msgid "Imap"
+msgstr "Importa"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Server"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Password dell'amministratore"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
 msgstr "Informazioni organizzazione"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
@@ -11195,6 +12334,21 @@ msgstr "Rimuovi le estensioni di posta"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Rimuovi le estensioni di posta"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "server"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "utenti"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Informazioni organizzazione"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11217,6 +12371,7 @@ msgid "Phone queue"
 msgstr "Numero di telefono"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 #, fuzzy
 msgid "System"
 msgstr "Sistemi"
@@ -11234,6 +12389,11 @@ msgstr ""
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "Opzioni di posta dell'identità"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Accesso ai sistemi"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -11291,6 +12451,7 @@ msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
@@ -11375,6 +12536,16 @@ msgstr "Account Kolab"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Elimina estensioni Unix"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Gruppo di oggetti"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Membri"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11401,6 +12572,7 @@ msgid "Generic queue Settings"
 msgstr "Impostazioni generali delle code"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout"
@@ -11431,6 +12603,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -11483,26 +12656,32 @@ msgid "Phone attributes "
 msgstr "Attributo DN delle persone"
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -11536,6 +12715,11 @@ msgstr "Account Kolab"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Elimina estensioni Unix"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Gruppo primario"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 #, fuzzy
 msgid "ring all"
@@ -11669,6 +12853,69 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "Opzioni di posta dell'identità"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "I membri sono in un gruppo di risposta telefonica"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Coda della posta"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Messaggio di di risposta automatica"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Benvenuto %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+msgid "'Thank you' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+msgid "'Second' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Benvenuto %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Numero di telefono"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Messaggio di di risposta automatica"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 #, fuzzy
@@ -11875,12 +13122,50 @@ msgstr ""
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Gruppo di oggetti"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Mostra stampanti"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Script path"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Lista dei dipartimenti"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nuovo template"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Template"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Template"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Cognome"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Permessi"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 #, fuzzy
 msgid "FAI"
 msgstr "FAX"
@@ -11921,6 +13206,16 @@ msgstr "Il valore specificato per l'UID non è valido."
 msgid "Specified freeze name is invalid."
 msgstr "Il valore specificato per l'UID non è valido."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Dirigenza"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Riferimenti"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 #, fuzzy
 msgid "Install method"
@@ -12067,74 +13362,110 @@ msgstr ""
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Stampante"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#, fuzzy
+msgid "Package"
+msgstr "Pacchetti"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Liste di blocco"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Metodo di amministrazione della posta"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 #, fuzzy
 msgid "Script bundle"
 msgstr "Script path"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 #, fuzzy
 msgid "Please enter a valid name."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Stampante"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Path del profilo"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Riferimenti"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Stampante"
 
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:475
 #, fuzzy
-msgid "FAI classes"
-msgstr "Scegli il tuo numero di telefono personale"
+msgid "FAI hook"
+msgstr "Mostra errori PHP"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -12152,6 +13483,7 @@ msgid "FS type"
 msgstr "Tipo"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 #, fuzzy
 msgid "Mount point"
@@ -12164,6 +13496,7 @@ msgid "Size in MB"
 msgstr "Connesso:"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 #, fuzzy
 msgid "Mount options"
@@ -12253,6 +13586,7 @@ msgid "Variable attributes"
 msgstr "Attributo DN delle persone"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 #, fuzzy
 msgid "Variable content"
 msgstr "Mostra terminali"
@@ -12292,6 +13626,41 @@ msgstr "Mostra workstation"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Stampante"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Stampante"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Destinazione"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Partizioni"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Sistemi"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Partizioni"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "Informazioni organizzazione"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partizioni"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 #, fuzzy
 msgid "Please enter a value for script."
@@ -12312,10 +13681,6 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "Hook attributes"
 msgstr "Attributo DN delle persone"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -12406,6 +13771,11 @@ msgstr "Applicazioni disponibili"
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Stampante"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Mostra il nome"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
@@ -12461,6 +13831,7 @@ msgid "Destination path"
 msgstr "Destinazione"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -12533,11 +13904,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-#, fuzzy
-msgid "Package"
-msgstr "Pacchetti"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12831,6 +14197,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Prego inserire un numero di telefono valido!"
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Gruppo primario"
@@ -12853,6 +14220,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtri"
@@ -12934,11 +14302,27 @@ msgstr "Prego inserire un numero di telefono valido!"
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "Non hai il permesso di cambiare la tua password."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Tipo"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "Tipo"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Crea estensioni per le applicazioni"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Applicazioni in uso"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -13142,6 +14526,36 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Elimina estensioni Unix"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Metodi di recapito"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Telefono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voivemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Numero di telefono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Opzioni di posta dell'identità"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13299,6 +14713,20 @@ msgstr "Prego inserire un numero di telefono valido!"
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Crea estensioni di posta"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Riferimenti"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Nome gruppo"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -13435,6 +14863,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
@@ -13445,6 +14874,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Riferimenti"
@@ -13454,6 +14884,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -13472,13 +14903,10 @@ msgid "Count users"
 msgstr "Paese"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Conferenze telefoniche"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Dirigenza"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13520,6 +14948,48 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Riferimenti"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Conferenza"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Attiva la risposta automatica"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Paese"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Riferimenti"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "Informazioni"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
@@ -13564,6 +15034,9 @@ msgid "Duration"
 msgstr "Durata"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Rapporti telefono"
 
@@ -13928,86 +15401,86 @@ msgstr ""
 msgid "References"
 msgstr "Riferimenti"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Account Kolab"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Elimina estensioni per le applicazioni"
@@ -14016,18 +15489,18 @@ msgstr "Elimina estensioni per le applicazioni"
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr ""
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -14097,7 +15570,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
@@ -14612,7 +16085,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Accesso al server LDAP fallito. La ragione è: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14732,120 +16205,120 @@ msgstr ""
 msgid "Access control"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Password attuale"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "incompleto"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Modifica"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Rimuovi"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "classe"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Gruppo di oggetti"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Membri"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Nome applicazione"
@@ -14941,54 +16414,54 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Rimuovi"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:293
 #, fuzzy
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15283,10 +16756,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN dell'amministratore"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Password dell'amministratore"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15587,8 +17056,20 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Dimensione quota"
+#~ msgid "Day"
+#~ msgstr "giorno"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Home"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Identificativo della casa"
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Certificato standard"
 
 #, fuzzy
 #~ msgid "Vocation message"
@@ -15760,10 +17241,6 @@ msgstr ""
 #~ msgid "New Entry"
 #~ msgstr "Stampante"
 
-#, fuzzy
-#~ msgid "Admin"
-#~ msgstr "DN dell'amministratore"
-
 #, fuzzy
 #~ msgid "Admin Toggle"
 #~ msgstr "DN dell'amministratore"
@@ -15776,10 +17253,6 @@ msgstr ""
 #~ "Questa identità non possiede estensioni Samba. Per poterle creare occorre "
 #~ "creare prima le estensioni Unix."
 
-#, fuzzy
-#~ msgid "OpenXchange"
-#~ msgstr "Open-Xchange"
-
 #, fuzzy
 #~ msgid ""
 #~ "This account has %s features disabled. Mail features are needed for "
@@ -15865,10 +17338,6 @@ msgstr ""
 #~ msgid "UNIX accounts"
 #~ msgstr "Account Unix"
 
-#, fuzzy
-#~ msgid "Profile"
-#~ msgstr "Path del profilo"
-
 #, fuzzy
 #~ msgid "Groupname"
 #~ msgstr "Nome gruppo"

diff --git a/locale/messages.po b/locale/messages.po
index 9a8c269ebd5c989861267511413615b9c713d2d3..6ac28e60c557ca2af16262ee89e3c614e80fc333 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr ""
 
@@ -27,6 +29,7 @@ msgid "Administration"
 msgstr ""
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr ""
 
@@ -38,18 +41,29 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -59,7 +73,9 @@ msgstr ""
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -70,6 +86,7 @@ msgstr ""
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -77,16 +94,21 @@ msgstr ""
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -101,23 +123,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -129,16 +156,19 @@ msgstr ""
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -162,6 +192,8 @@ msgid "Parameter"
 msgstr ""
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
@@ -173,8 +205,9 @@ msgstr ""
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -244,6 +277,7 @@ msgstr ""
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -271,7 +305,7 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr ""
 
@@ -386,7 +420,7 @@ msgstr ""
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -432,12 +466,12 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -493,9 +527,9 @@ msgstr ""
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -519,8 +553,8 @@ msgstr ""
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -531,8 +565,8 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -566,6 +600,7 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -589,8 +624,9 @@ msgid "not defined"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr ""
 
@@ -707,14 +743,14 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr ""
 
@@ -743,7 +779,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr ""
 
@@ -763,7 +799,7 @@ msgstr ""
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -811,7 +847,7 @@ msgid "User mail settings"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr ""
@@ -866,180 +902,185 @@ msgstr ""
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 msgid "Mail max size"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 msgid "Forwarding address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 msgid "Local delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Add vacation information"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -1118,10 +1159,15 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1177,8 +1223,8 @@ msgid "External password changer reported a problem: "
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1186,16 +1232,17 @@ msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1215,6 +1262,7 @@ msgstr ""
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr ""
 
@@ -1233,7 +1281,7 @@ msgid "Account"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr ""
 
@@ -1606,46 +1654,46 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Shadow last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 msgid "System trust model"
 msgstr ""
 
@@ -1676,7 +1724,7 @@ msgid "Allow user to change password from client"
 msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -1685,7 +1733,7 @@ msgid "Temporary disable samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr ""
 
@@ -1694,12 +1742,12 @@ msgid "Terminal Server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr ""
 
@@ -1764,17 +1812,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1787,7 +1835,7 @@ msgid "Allow connection from these workstations only"
 msgstr ""
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr ""
 
@@ -1901,35 +1949,35 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 msgid "Account expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 msgid "Allow user to change password"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 msgid "Password expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 msgid "Generic home directory"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 msgid "Generic script path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 msgid "Generic profile path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 msgid "Allow connection from"
 msgstr ""
 
@@ -1970,171 +2018,167 @@ msgstr ""
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2144,66 +2188,108 @@ msgstr ""
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1318
 msgid "User password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2216,177 +2302,150 @@ msgstr ""
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1338
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1337
-msgid "User certificate PKCS12"
+#: plugins/personal/generic/class_user.inc:1342
+msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1341
-msgid "User certificate SMIME"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2410,67 +2469,69 @@ msgstr ""
 msgid "Select a base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2478,7 +2539,7 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -2513,8 +2574,8 @@ msgstr ""
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2543,7 +2604,7 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2577,10 +2638,6 @@ msgstr ""
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr ""
@@ -2644,6 +2701,7 @@ msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr ""
 
@@ -2656,6 +2714,7 @@ msgid "Limit proxy access to working time"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
@@ -2667,16 +2726,36 @@ msgstr ""
 msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+msgid "PHP GW account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+msgid "phpgwAccountExpires"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+msgid "phpgwAccountType"
+msgstr ""
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
@@ -2693,6 +2772,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr ""
 
@@ -2728,123 +2808,176 @@ msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+msgid "Kolab account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+msgid "Mail size restriction"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+msgid "Free busy information"
+msgstr ""
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+msgid "Ftp"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+msgid "Pure ftp account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+msgid "Quota files"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+msgid "Upload ratio"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+msgid "Quota MBytes"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+msgid "Download ratio"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+msgid "Upload bandwith"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+msgid "Download bandwith"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
@@ -2885,143 +3018,210 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:3
-msgid "Intranet account"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+msgid "Open xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:65
-msgid "This account has no connectivity extensions."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+msgid "Open xchange account settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+msgid "OXAppointmentDays"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/admin/systems/goMailServer.tpl:18
-#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+msgid "mailEnabled"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+msgid "OXTimeZone"
+msgstr ""
+
+#: plugins/personal/connectivity/intranet.tpl:3
+msgid "Intranet account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:65
+msgid "This account has no connectivity extensions."
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:173
+msgid "Connectivity settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+msgid "Connectivity  account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+msgid "gosaProxyID"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+msgid "Limit proxy access"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+msgid "Limit quota"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+msgid "Quota limit period"
+msgstr ""
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+msgid "Intranet account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+msgid "GOsa intranet account"
+msgstr ""
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr ""
 
@@ -3045,6 +3245,7 @@ msgid "Teams"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr ""
 
@@ -3052,38 +3253,54 @@ msgstr ""
 msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+msgid "PHP Schedule it"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+msgid "PHP Schedule it settings"
+msgstr ""
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+msgid "Open groupware account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+msgid "Open groupware account"
+msgstr ""
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -3115,7 +3332,7 @@ msgid "Profil quota"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr ""
 
@@ -3124,7 +3341,7 @@ msgid "Kiosk profile settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr ""
 
@@ -3133,24 +3350,26 @@ msgid "Manage"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr ""
 
@@ -3382,23 +3601,27 @@ msgid "Administrator"
 msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 msgid "Environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 msgid "Profile server"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 msgid "Profile quota"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3443,28 +3666,51 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3500,7 +3746,7 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3593,30 +3839,37 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr ""
 
@@ -3699,6 +3952,38 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+msgid "Nagios account settings"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+msgid "View all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+msgid "View all services"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+msgid "Trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+msgid "Trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+msgid "View configuration information"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+msgid "View system informations"
+msgstr ""
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr ""
@@ -3750,12 +4035,25 @@ msgstr ""
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+msgid "apple-user-homeDirectory"
+msgstr ""
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr ""
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr ""
 
@@ -3773,13 +4071,16 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3803,7 +4104,43 @@ msgstr ""
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr ""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr ""
 
@@ -3833,65 +4170,92 @@ msgstr ""
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr ""
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+msgid "Fax Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
 msgstr ""
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+msgid "Blocklist type"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
@@ -4028,12 +4392,12 @@ msgstr ""
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr ""
 
@@ -4167,7 +4531,7 @@ msgstr ""
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr ""
 
@@ -4194,7 +4558,7 @@ msgstr ""
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr ""
 
@@ -4209,7 +4573,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -4219,6 +4585,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr ""
 
@@ -4243,6 +4610,7 @@ msgid "Deliver fax as mail"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -4376,6 +4744,22 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+msgid "Fax account settings"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+msgid "Receive blocklist"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+msgid "Send blocklist"
+msgstr ""
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4533,38 +4917,13 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+msgid "Fax report"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+msgid "Detailed view"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:15
@@ -4687,7 +5046,7 @@ msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr ""
 
@@ -5363,7 +5722,8 @@ msgid "Notifications"
 msgstr ""
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr ""
@@ -5437,12 +5797,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5568,6 +5928,30 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+msgid "Generic group settings"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+msgid "Phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+msgid "Nagios group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+msgid "Samba group type"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+msgid "Samba SID"
+msgstr ""
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr ""
@@ -5588,7 +5972,8 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr ""
 
@@ -5604,7 +5989,8 @@ msgstr ""
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr ""
 
@@ -5643,6 +6029,24 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr ""
 
+#: plugins/admin/groups/class_groupMail.inc:981
+msgid "Group mail"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:989
+msgid "Alternate addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:990
+msgid "Forwarding addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr ""
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr ""
@@ -5732,18 +6136,6 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -5846,13 +6238,45 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
+#: plugins/admin/groups/class_groupApplication.inc:1063
+msgid "Group applications"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:35
-#: plugins/admin/groups/class_divListGroup.inc:36
-msgid "List of groups"
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+msgid "Application parameter"
+msgstr ""
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:41
@@ -5926,14 +6350,6 @@ msgstr ""
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6038,6 +6454,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr ""
 
@@ -6193,7 +6610,9 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr ""
 
@@ -6203,6 +6622,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6222,7 +6642,9 @@ msgid "Choose subtree to place application in"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr ""
 
@@ -6236,22 +6658,27 @@ msgid "Reload picture from LDAP"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -6289,6 +6716,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr ""
 
@@ -6390,6 +6818,18 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+msgid "Application generic"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+msgid "Script content"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6451,6 +6891,7 @@ msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr ""
 
@@ -6484,6 +6925,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr ""
 
@@ -6492,10 +6934,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -6539,69 +6981,83 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr ""
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6617,20 +7073,6 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr ""
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6677,6 +7119,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6689,6 +7132,8 @@ msgstr ""
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -6754,11 +7199,14 @@ msgid "Terminal Service"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr ""
@@ -6926,8 +7374,11 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr ""
 
@@ -6939,7 +7390,9 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr ""
 
@@ -6950,6 +7403,7 @@ msgid "Choose server to use for logging"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr ""
 
@@ -6958,6 +7412,7 @@ msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr ""
 
@@ -7105,6 +7560,111 @@ msgstr ""
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+msgid "Service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+msgid "Monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+msgid "Method"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+msgid "Gfx driver"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+msgid "Vsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:443
+msgid "Printer service enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+msgid "Scanner enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:446
+msgid "Scanner model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+msgid "Mouse type"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+msgid "Mouse port"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7118,6 +7678,26 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+msgid "Terminal startup"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+msgid "Ldap server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+msgid "Kernel paramenter"
+msgstr ""
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr ""
@@ -7135,6 +7715,7 @@ msgid "Workstation template"
 msgstr ""
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr ""
 
@@ -7164,10 +7745,6 @@ msgstr ""
 msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr ""
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr ""
@@ -7278,6 +7855,34 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+msgid "Terminal generic"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+msgid "Syslog server enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+msgid "Ntp server settings"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+msgid "Action flag"
+msgstr ""
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7345,6 +7950,15 @@ msgstr ""
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+msgid "Server generic"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+msgid "Goto mode"
+msgstr ""
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr ""
@@ -7395,6 +8009,23 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+msgid "Workstation generic"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+msgid "Ntp server"
+msgstr ""
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr ""
@@ -7447,19 +8078,6 @@ msgstr ""
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr ""
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr ""
@@ -7507,6 +8125,7 @@ msgid "Zones"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr ""
 
@@ -7515,22 +8134,27 @@ msgid "Postfix mydestination"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr ""
 
@@ -7547,6 +8171,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr ""
 
@@ -7559,6 +8184,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
@@ -7583,6 +8209,7 @@ msgid "Host used to relay mails"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
@@ -7617,6 +8244,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr ""
 
@@ -7653,9 +8281,48 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 msgid "DNS service"
 msgstr ""
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:401
+msgid "Primary dns server"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr ""
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -7667,6 +8334,7 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr ""
 
@@ -7703,16 +8371,19 @@ msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr ""
 
@@ -7733,6 +8404,7 @@ msgid "Glpi database"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr ""
@@ -7741,6 +8413,70 @@ msgstr ""
 msgid "Machine name"
 msgstr ""
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+msgid "Fax server"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+msgid "Fax server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+msgid "Login name"
+msgstr ""
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -7801,6 +8537,34 @@ msgstr ""
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+msgid "Kolab service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:423
+msgid "My destination"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:424
+msgid "FTP FreeBusy service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+msgid "Relayhost"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:428
+msgid "HTTP FreeBusy service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -7907,6 +8671,18 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+msgid "Print generic"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+msgid "Printer PPD"
+msgstr ""
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7946,6 +8722,56 @@ msgstr ""
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+msgid "Component generic"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+msgid "Network device"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr ""
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 msgid "Time server"
 msgstr ""
@@ -7955,6 +8781,7 @@ msgid "Printer type"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -7968,6 +8795,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -7976,10 +8804,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr ""
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr ""
@@ -7993,11 +8817,15 @@ msgid "Contacts"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr ""
 
@@ -8009,48 +8837,6 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr ""
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr ""
@@ -8060,6 +8846,7 @@ msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Volume"
 msgstr ""
 
@@ -8072,6 +8859,7 @@ msgid "Codepage"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Option"
 msgstr ""
 
@@ -8081,10 +8869,12 @@ msgid "System type"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8176,6 +8966,32 @@ msgstr ""
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+msgid "Phone generic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+msgid "Phone hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+msgid "Default ip"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8213,6 +9029,18 @@ msgstr ""
 msgid "Option contains invalid characters."
 msgstr ""
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:273
+msgid "Charset"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8264,6 +9092,32 @@ msgid ""
 "empty string."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+msgid "System startup"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+msgid "Kernel parameter"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+msgid "Debian release"
+msgstr ""
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr ""
@@ -8286,10 +9140,6 @@ msgstr ""
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr ""
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8420,6 +9270,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr ""
 
@@ -8446,6 +9297,7 @@ msgstr ""
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr ""
 
@@ -8493,6 +9345,10 @@ msgstr ""
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:430
+msgid "Workstation service"
+msgstr ""
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8543,13 +9399,6 @@ msgstr ""
 msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -8619,11 +9468,6 @@ msgstr ""
 msgid "Boot parameters"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr ""
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -8650,7 +9494,9 @@ msgstr ""
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr ""
@@ -8703,10 +9549,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr ""
@@ -8743,10 +9585,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -8756,11 +9594,13 @@ msgid "Select scanner driver to use"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr ""
 
@@ -8786,6 +9626,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 msgid "Repository service"
 msgstr ""
 
@@ -8813,6 +9654,14 @@ msgstr ""
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+msgid "Releases"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr ""
@@ -8825,6 +9674,48 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+msgid "Glpi server"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+msgid "Glpi server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+msgid "Admin"
+msgstr ""
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr ""
@@ -8960,6 +9851,87 @@ msgstr ""
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+msgid "Inventory extension"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+msgid "Attachment name"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+msgid "Attachment comment"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+msgid "Attachment mime type"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+msgid "Attachment filename"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+msgid "Device monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+msgid "Device case"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+msgid "Device motherboard"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+msgid "Device soundcard"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+msgid "Device processor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+msgid "Device misc device"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+msgid "Device ram"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+msgid "Device hard disk drive"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+msgid "Device drive"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+msgid "Device controler"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+msgid "Device graphics card"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+msgid "Device power supply"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+msgid "Device pci device"
+msgstr ""
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr ""
@@ -8996,6 +9968,7 @@ msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr ""
@@ -9127,6 +10100,7 @@ msgid "Add/Edit network interface"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr ""
 
@@ -9451,19 +10425,39 @@ msgstr ""
 msgid "since"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+msgid "Printer inventory extension"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+msgid "Supports serial interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+msgid "Supports parallel interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+msgid "Supports usb interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+msgid "Cartridge settings"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
 msgid "Cartridges"
 msgstr ""
 
@@ -9519,6 +10513,18 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_termDNS.inc:511
+msgid "DNS settings"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:519
+msgid "DNS records"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:522
+msgid "IP address"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -9552,18 +10558,10 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -9580,16 +10578,6 @@ msgstr ""
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr ""
@@ -9626,7 +10614,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr ""
 
@@ -9955,61 +10943,51 @@ msgstr ""
 msgid "All available services are already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
-#, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goCupsServer.inc:206
+msgid "Cups"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
-#, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goCupsServer.inc:207
+msgid "Cups service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
-msgid "The attribute user is empty or contains invalid characters."
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
+#: plugins/admin/systems/class_goTerminalServer.inc:79
 #, php-format
-msgid "The attribute password is empty or contains invalid characters."
+msgid "Removing server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
+#: plugins/admin/systems/class_goTerminalServer.inc:102
 #, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgid "Saving server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
-msgid "LDAP service"
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystemService.inc:17
@@ -10089,31 +11067,89 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
-msgid "Inventory database"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
-msgid "Glpi management"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
 #, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
-msgid "The attribute database is empty or contains invalid characters."
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:219
+msgid "NTP"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+msgid "Ntp source"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+msgid "Ldap service"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+msgid "Ldap base"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:7
@@ -10133,6 +11169,7 @@ msgid "This value specifies the maximal header size."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr ""
 
@@ -10141,6 +11178,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 msgid "Max message size"
 msgstr ""
 
@@ -10149,6 +11187,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 msgid "Relay host"
 msgstr ""
 
@@ -10157,6 +11196,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10169,6 +11209,7 @@ msgid "Domains and routing"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10189,6 +11230,7 @@ msgid "Restrictions"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr ""
 
@@ -10197,148 +11239,49 @@ msgstr ""
 msgid "Restriction filter"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:129
-msgid "Restrictions for recipient"
-msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:149
-#: plugins/admin/systems/goImapServer.tpl:76
-msgid "The server must be saved before you can use the status flag."
-msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:151
-#: plugins/admin/systems/goImapServer.tpl:78
-msgid "The service must be saved before you can use the status flag."
-msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:154
-#: plugins/admin/systems/goImapServer.tpl:81
-msgid "Set new status"
-msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:160
-#: plugins/admin/systems/goImapServer.tpl:87
-msgid "Set status"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:44
-msgid "Start IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:51
-msgid "Start IMAP SSL service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:58
-msgid "Start POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:65
-msgid "Start POP3 SSL service"
-msgstr ""
-
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
+#: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
+msgid "Restrictions for recipient"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:70
-msgid "NTP service"
+#: plugins/admin/systems/goMailServer.tpl:149
+#: plugins/admin/systems/goImapServer.tpl:76
+msgid "The server must be saved before you can use the status flag."
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
+#: plugins/admin/systems/goMailServer.tpl:151
+#: plugins/admin/systems/goImapServer.tpl:78
+msgid "The service must be saved before you can use the status flag."
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
+#: plugins/admin/systems/goMailServer.tpl:154
+#: plugins/admin/systems/goImapServer.tpl:81
+msgid "Set new status"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+msgid "Set status"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
+msgid "Start IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
+msgid "Start IMAP SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
+msgid "Start POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:133
-msgid "The given base is empty or contains invalid characters."
+#: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
+msgid "Start POP3 SSL service"
 msgstr ""
 
 #: plugins/admin/systems/class_goSyslogServer.inc:26
@@ -10346,6 +11289,7 @@ msgid "Logging service"
 msgstr ""
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 msgid "Syslog service"
 msgstr ""
 
@@ -10364,9 +11308,8 @@ msgstr ""
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "enabled"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+msgid "Syslog"
 msgstr ""
 
 #: plugins/admin/systems/class_goFonServer.inc:32
@@ -10405,6 +11348,22 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+msgid "GoFon server"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+msgid "GoFon server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+msgid "Area code"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+msgid "Country code"
+msgstr ""
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10420,11 +11379,21 @@ msgstr ""
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
-msgid "GLPI database information"
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+msgid "Log"
+msgstr ""
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+msgid "Log service"
+msgstr ""
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
 msgstr ""
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 msgid "Kerberos service"
 msgstr ""
 
@@ -10462,8 +11431,8 @@ msgstr ""
 msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+msgid "Realm"
 msgstr ""
 
 #: plugins/admin/systems/class_goMailServer.inc:44
@@ -10501,6 +11470,22 @@ msgstr ""
 msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+msgid "Mail service"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+msgid "Transport table"
+msgstr ""
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr ""
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr ""
@@ -10553,8 +11538,21 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
-msgid "Logging database information"
+#: plugins/admin/systems/class_goImapServer.inc:273
+msgid "Imap"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+msgid "Imap service"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr ""
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
 #: plugins/admin/systems/class_goShareServer.inc:31
@@ -10591,6 +11589,18 @@ msgstr ""
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+msgid "Share service"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+msgid "Share entry"
+msgstr ""
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr ""
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -10612,6 +11622,7 @@ msgid "Phone queue"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr ""
 
@@ -10628,6 +11639,10 @@ msgstr ""
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+msgid "System group"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -10685,6 +11700,7 @@ msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr ""
@@ -10769,6 +11785,14 @@ msgstr ""
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+msgid "Object group generic"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+msgid "Member"
+msgstr ""
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -10793,6 +11817,7 @@ msgid "Generic queue Settings"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr ""
 
@@ -10821,6 +11846,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -10869,26 +11895,32 @@ msgid "Phone attributes "
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -10920,6 +11952,10 @@ msgstr ""
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+msgid "Mail group"
+msgstr ""
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
@@ -11047,6 +12083,62 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+msgid "Phone group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+msgid "Max queue lenght"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+msgid " Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+msgid "Welcome music"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+msgid "'Thank you' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+msgid "'Second' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+msgid "Queue phone number"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+msgid "Announce"
+msgstr ""
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11223,12 +12315,43 @@ msgstr ""
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+msgid "FAI script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:460
+msgid "Script priority"
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+msgid "FAI template"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+msgid "Template file"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+msgid "Template path"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+msgid "File owner"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+msgid "File permissions"
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr ""
 
@@ -11265,6 +12388,15 @@ msgstr ""
 msgid "Specified freeze name is invalid."
 msgstr ""
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+msgid "FAI management"
+msgstr ""
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr ""
@@ -11394,70 +12526,101 @@ msgstr ""
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+msgid "FAI Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+msgid "Install Method"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+msgid "Profile"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+msgid "FAI profile"
+msgstr ""
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:475
+msgid "FAI hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
@@ -11473,6 +12636,7 @@ msgid "FS type"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr ""
@@ -11483,6 +12647,7 @@ msgid "Size in MB"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr ""
@@ -11564,6 +12729,7 @@ msgid "Variable attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr ""
 
@@ -11600,6 +12766,34 @@ msgstr ""
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+msgid "FAI partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+msgid "Partition type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+msgid "Partition no."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+msgid "File system type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+msgid "Partition size"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+msgid "File system options"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+msgid "Partition flags"
+msgstr ""
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr ""
@@ -11617,10 +12811,6 @@ msgstr ""
 msgid "Hook attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -11701,6 +12891,10 @@ msgstr ""
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+msgid "FAI variable"
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
@@ -11747,6 +12941,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -11809,10 +13004,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12071,6 +13262,7 @@ msgid "Please enter a name for the mime type here"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 msgid "Mime group"
 msgstr ""
 
@@ -12091,6 +13283,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 msgid "File patterns"
 msgstr ""
 
@@ -12163,10 +13356,23 @@ msgstr ""
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr ""
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+msgid "Mime type generic"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr ""
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+msgid "Left click action"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+msgid "Embedded applications"
+msgstr ""
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 msgid "Manage mime types"
 msgstr ""
@@ -12354,6 +13560,31 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+msgid "Phone account settings"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+msgid "Delivery mode"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+msgid "Telephone pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voivemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+msgid "Telephone number"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+msgid "Macro settings"
+msgstr ""
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -12496,6 +13727,18 @@ msgstr ""
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+msgid "Asterisk macro management"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+msgid "Macro content"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr ""
@@ -12611,6 +13854,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr ""
 
@@ -12620,6 +13864,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr ""
 
@@ -12628,6 +13873,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -12644,13 +13890,10 @@ msgid "Count users"
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr ""
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -12690,6 +13933,42 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+msgid "Phone conference management"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+msgid "Conference PIN"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+msgid "Activate menu"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+msgid "Count user"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+msgid "Conference type"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+msgid "Format"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr ""
@@ -12731,6 +14010,9 @@ msgid "Duration"
 msgstr ""
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr ""
 
@@ -13084,85 +14366,85 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 msgid "You are not allowed to delete this snap shot!"
 msgstr ""
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
@@ -13171,18 +14453,18 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr ""
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -13251,7 +14533,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
@@ -13723,7 +15005,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -13834,108 +15116,108 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 msgid "Edit ACL"
 msgstr ""
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 msgid "Delete ACL"
 msgstr ""
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 msgid "Edit categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 msgid "Move object"
 msgstr ""
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 msgid "Remove object"
 msgstr ""
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 msgid "Members:"
 msgstr ""
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr ""
@@ -14028,52 +15310,52 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -14352,10 +15634,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr ""
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "

diff --git a/locale/nl/LC_MESSAGES/messages.mo b/locale/nl/LC_MESSAGES/messages.mo
index d0a5f17856c8135b87bfa195d82671b45aa7d9ea..e215a940364281d1fd6021f46696adba1dc7db33 100644 (file)
Binary files a/locale/nl/LC_MESSAGES/messages.mo and b/locale/nl/LC_MESSAGES/messages.mo differ

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index c8c41590021509ec8a51349f3544b5a3fd26ff56..f82cde5ec44a71548eec1089b6255f427961020b 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -7,13 +7,15 @@
 #
 # Translator:
 # Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005.
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -21,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Mijn account"
 
@@ -30,6 +32,7 @@ msgid "Administration"
 msgstr "Beheer"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Plugins"
 
@@ -41,18 +44,29 @@ msgstr "Plugins"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -62,7 +76,9 @@ msgstr "Plugins"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Algemeen"
@@ -73,6 +89,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -80,16 +97,21 @@ msgstr "Omgeving"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "E-mail"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -104,23 +126,28 @@ msgstr "Netatalk"
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Verbindingen"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -132,16 +159,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefoon"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -165,6 +195,8 @@ msgid "Parameter"
 msgstr "Parameters"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Opstarten"
@@ -176,8 +208,9 @@ msgstr "Apparaten"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -247,6 +280,7 @@ msgstr "Partities"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -274,7 +308,7 @@ msgstr "Profielen"
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Pakketten"
 
@@ -389,7 +423,7 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -435,12 +469,12 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -496,9 +530,9 @@ msgstr "Toevoegen"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -522,8 +556,8 @@ msgstr "Toevoegen"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -534,8 +568,8 @@ msgstr "Toevoegen"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -569,6 +603,7 @@ msgstr "Primair adres"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -592,8 +627,9 @@ msgid "not defined"
 msgstr "niet gedefiniëerd"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Quota grootte"
 
@@ -712,14 +748,14 @@ msgstr "Wijs E-mail af indien groter dan"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
@@ -750,7 +786,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Gebruik een eigen sieve script"
 
@@ -770,7 +806,7 @@ msgstr "schakelt alle E-mail opties uit!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -820,7 +856,7 @@ msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "E-mail instellingen"
@@ -875,27 +911,27 @@ msgstr "Dit doet iets"
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "De E-mail methode '%s' opgegeven in uw gosa.conf is niet beschikbaar."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Kan quota informatie niet ophaleven voor '%s'."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "E-mail account verwijderen"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -904,13 +940,13 @@ msgstr ""
 "Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "E-mail account aanmaken"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -919,21 +955,21 @@ msgstr ""
 "Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
 "knop hieronder te gebruiken."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Het toevoegen van een van uw eigen adressen aan de lijst met doorstuur "
 "adressen is niet logisch."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -942,74 +978,74 @@ msgstr ""
 "U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
 "alternatieve adressen."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Het verwijderen van het E-mail account is mislukt"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Het opslaan van het E-mail account is mislukt"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Er is geen geldige mailserver gespecificeerd. Voeg er a.u.b. een toe in de "
 "systeem instellingen."
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Het vereiste veld 'Primair adres' is leeg."
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
 "afwijzen."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 "Bezig met wachten op het verwijderen van alle mail eigenschappen door Kolab"
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -1017,62 +1053,67 @@ msgstr ""
 "Verwijder a.u.b. eerst het mail account, zodat kolab haar verwijder "
 "procedure kan starten."
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Mail server"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "E-mail grootte"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Primair adres"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
 msgid "Spam level"
 msgstr "Log prioriteit"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
 msgid "Spam mail box"
 msgstr "E-mail grootte"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Alternatieve adressen"
@@ -1159,10 +1200,15 @@ msgstr "Terug"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1223,8 +1269,8 @@ msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1232,16 +1278,17 @@ msgid "Home directory"
 msgstr "Persoonlijke map"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Primaire groep"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1261,6 +1308,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1279,7 +1327,7 @@ msgid "Account"
 msgstr "Account"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
@@ -1665,54 +1713,54 @@ msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Toon pakketten"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -1744,7 +1792,7 @@ msgid "Allow user to change password from client"
 msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 
@@ -1753,7 +1801,7 @@ msgid "Temporary disable samba account"
 msgstr "Schakel het Samba/Windows account tijdelijk uit"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Domein"
 
@@ -1762,12 +1810,12 @@ msgid "Terminal Server"
 msgstr "Terminal Server"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Sta inloggen op de Terminal Server toe"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Client configuratie voor initieel programma overnemen"
 
@@ -1832,17 +1880,17 @@ msgid "Reconnect if disconnected"
 msgstr "Herstel sessie indien verbroken"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Blokkeer het Samba/Windows account"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Stel laatste inlogtijd in op"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Stel laatste uitlogtijd in op"
 
@@ -1855,7 +1903,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Samba Instellingen"
 
@@ -1982,41 +2030,41 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Het opslaan van het Samba account is mislukt"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "Het account verloopt op"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "Wachtwoord verloopt op"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Persoonlijke map"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Inlogscript"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Profielpad"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
@@ -2059,60 +2107,55 @@ msgstr "ongeldig"
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "Kerberos database communicatie is mislukt"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 "U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
 "'Basis'."
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr "Het vereiste veld 'Inlog naam' is leeg."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2120,7 +2163,7 @@ msgstr ""
 "Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
 "de database."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2128,109 +2171,109 @@ msgstr ""
 "Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
 "liggende streepjes zijn toegestaan."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Het veld 'Website' bevat een ongeldige URL."
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Funktie"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2241,69 +2284,111 @@ msgstr "Postcode"
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Basis"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Wachtwoord wissen"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Naam"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organisatie"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2316,188 +2401,160 @@ msgstr "Organisatie"
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Afzender"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Persoonlijk plaatje"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Standaard certificaat"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Standaard certificaat"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Verander plaatje"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Voornaam"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Inlognaam"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Stel in"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Basis"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2521,67 +2578,69 @@ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
 msgid "Select a base"
 msgstr "Selecteer een basis"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Bewerk certificaten"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Bewerk eigenschappen"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2589,7 +2648,7 @@ msgstr "GSM"
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
@@ -2627,8 +2686,8 @@ msgstr "Plaatje verwijderen"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2657,7 +2716,7 @@ msgstr "Standaard certificaat"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2691,10 +2750,6 @@ msgstr "Certificaat serienummer"
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Persoonlijk plaatje"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Wachtwoord wissen"
@@ -2758,6 +2813,7 @@ msgid "Temporary disable FTP access"
 msgstr "Schakel FTP toegang tijdelijk uit"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Proxy account"
 
@@ -2772,6 +2828,7 @@ msgid "Limit proxy access to working time"
 msgstr "Beperk proxy gebruik tot tijd"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Beperk proxy gebruik met quota"
 
@@ -2783,16 +2840,39 @@ msgstr "per"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Het verwijderen van het PHPGroupware account is mislukt"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Het opslaan van het PHPGroupware account is mislukt"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Groep instellingen"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "Het account verloopt op"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Account"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "PHPGroupware account"
@@ -2811,6 +2891,7 @@ msgstr ""
 "mail account toevoegd."
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr "Delegaties"
 
@@ -2846,16 +2927,18 @@ msgid "Invitation policy"
 msgstr "Uitnodigingsbeleid"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "U probeert een ongeldig email adres toe te voegen aan de delegatielijst."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2863,122 +2946,184 @@ msgstr ""
 "Het E-mail adres dat u probeert toe te voegen is geen primair E-mail adres "
 "van een bestaande gebruiker."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr "Altijd accepteren"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr "Altijd afwijzen"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr "Afwijzen bij conflicten"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr "Handmatig bij conflicten"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Handmatig"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "De waarde opgegeven als Free Busy toekomst dient een integer te zijn"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "De opgegeven waarde voor de Free Busy informatie URL is niet geldig."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Het uitnodigingsbeleid invoer voor adres '%s' is niet geldig"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr "Er is geen E-mail gebruiker met adres '%s' voor uw uitwisselingsbeleid"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Het opslaan van het Kolab account is mislukt"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Kolab account"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Mail distributielijst"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Free Busy informatie"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Het verwijderen van het webDAV account is mislukt"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Het opslaan van het webDAV account is mislukt"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "WebDAV Account"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "Ftp"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Het verwijderen van het pureftpd account is mislukt"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "De opgegeven waarde voor 'Verstuur Bandbreedte' is niet geldig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "De opgegeven waarde voor 'Ontvangst bandbreedte' is niet geldig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "De opgegeven waarde voor 'Bestanden' is niet geldig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "De opgegeven waarde voor 'Grootte' is niet geldig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "De opgegeven waarde voor 'Verhouding' is niet geldig."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Het opslaan van het pureftpd account is mislukt"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "WebDAV Account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "FS type"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Open-Xchange Account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Fax account aanmaken"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
-"Uitgeschakeld. Er is geen Postgresql ondersteuning gedetecteerd of de "
-"opgegeven database kon niet bereikt worden"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Quota grootte"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Uploaden"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Quota grootte"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Systeem configuratie"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Verstuur bandbreedte"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Ontvangst bandbreedte"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Open-Xchange Account"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+"Uitgeschakeld. Er is geen Postgresql ondersteuning gedetecteerd of de "
+"opgegeven database kon niet bereikt worden"
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -3008,48 +3153,78 @@ msgstr "Tijdzone"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr "Kan niet verbinden met de Postgresql Database!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr "Vereiste parameters voor Open-Xchange verbindingsmodule ontbreken!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "PHP4 module voor Postgresql Database ontbreekt!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Het verwijderen van het Open-Xchange adresboek is mislukt"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 "De Open-Xchange accountnaam is leeg en dus ongeldig! Verzeker uzelf ervan dat"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr "u geen vreemde karakters in de loginnaam gebruikt."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Open-Xchange account"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Afspraken"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Taken"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "gedeactiveerd"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Tijdzone"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Intranet account"
@@ -3058,94 +3233,145 @@ msgstr "Intranet account"
 msgid "This account has no connectivity extensions."
 msgstr "Dit account heeft geen verbindings mogelijkheden."
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Verbindingen"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Verbindingen"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "uur"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "dag"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "week"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "maand"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Het verwijderen van het proxy account is mislukt"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is leeg."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Het opslaan van het proxy account is mislukt"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Beperk proxy gebruik tot tijd"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Profiel quota"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Host notificatie periode"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "PPTP account"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Het verwijderen van het intranet account is mislukt"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Het opslaan van het intranet account is mislukt"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Intranet account"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Intranet account"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "GLPI account"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Het verwijderen van het PPTP account is mislukt"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Het opslaan van het PPTP account is mislukt"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr "OpenGroupware"
 
@@ -3169,6 +3395,7 @@ msgid "Teams"
 msgstr "Teams"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr "PHPScheduleIt account"
 
@@ -3176,21 +3403,31 @@ msgstr "PHPScheduleIt account"
 msgid "PHPscheduleit"
 msgstr "PHPScheduleIt"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Het verwijderen van het PHPScheduleIt account is mislukt"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Het opslaan van het PHPScheduleIt account is mislukt"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPScheduleIt"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPScheduleIt"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "OpenGroupware account"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
@@ -3198,7 +3435,7 @@ msgstr ""
 "OpenGroupware: Postgresql extensie ontbreekt in uw configuratie. Er kunnen "
 "geen database zoekopdrachten uitgevoerd worden."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
@@ -3206,7 +3443,7 @@ msgstr ""
 "OpenGroupware: Database configuratie voor OpenGroupware ontbreekt. Er kan "
 "geen informatie opgehaald of opgeslagen worden."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3214,6 +3451,16 @@ msgstr ""
 "OpenGroupware: Kan niet verbinden met de opgegeven database. Controleer uw "
 "configuratie a.u.b. nogmaals."
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "OpenGroupware account"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "OpenGroupware account"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "De omgevings extensie is momenteel uitgeschakeld."
@@ -3245,7 +3492,7 @@ msgid "Profil quota"
 msgstr "Profiel quota"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr "Profiel lokaal cachen"
 
@@ -3254,7 +3501,7 @@ msgid "Kiosk profile settings"
 msgstr "Kiosk profiel instellingen"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr "Kiosk profiel"
 
@@ -3263,24 +3510,26 @@ msgid "Manage"
 msgstr "Beheer"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr "Resolutie is binnen de sessie te veranderen"
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Resolutie"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Shares"
 
@@ -3527,26 +3776,30 @@ msgid "Administrator"
 msgstr "Beheerder"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Standaard printer"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Gebruikersomgeving instellingen"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Bestandserver"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Profiel quota"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Login script"
@@ -3591,28 +3844,51 @@ msgstr "Scriptnaam"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3648,7 +3924,7 @@ msgstr "Script kan vervangen worden door gebruiker"
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3744,30 +4020,37 @@ msgid "Nagios Account"
 msgstr "Nagios account"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Host notificatie periode"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Service notificatie periode"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Service notificatie opties"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Host notificatie opties"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Service notificatie commando's"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Host notificatie commando's"
 
@@ -3854,6 +4137,46 @@ msgstr "Geef a.u.b. een geldig E-mail adres voor het 'NagiosMail' veld op."
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Het verwijderen van het Nagios account is mislukt"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Nagios instellingen"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "alle hosts bekijken"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "alle services bekijken"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "systeem commando's activeren"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "alle host commando's activeren"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "alle service commando's activeren"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "configuratie informatie bekijken"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "systeem informatie bekijken"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Nagios instellingen"
@@ -3909,12 +4232,26 @@ msgstr "Het opslaan van het Netatalk account is mislukt"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Het verwijderen van het Netatalk account is mislukt"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Persoonlijke map"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Share"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr "Pad"
 
@@ -3932,13 +4269,16 @@ msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3962,7 +4302,47 @@ msgstr "Geblokkeerde nummers"
 msgid "Numbers can also contain wild cards."
 msgstr "Nummers kunnen ook wildcards (*?) bevatten."
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
+"onmogelijk is voor GOsa om de data terug te halen."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
+"om te annuleren."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Blokkeerlijst beheer"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Fax blokkades"
 
@@ -3992,71 +4372,96 @@ msgstr "ontvangen"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Het verwijderen van het blokeerlijst object is mislukt"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 "U heeft geen toestemming een blokkeerlijst aan te maken onder deze 'basis'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "Vereist veld 'Naam' is leeg."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Vereist veld 'Naam' bevat ongeldige karakters"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr "Geen toestemming om een blokkeerlijst aan te maken onder deze basis."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Het opslaan van het blokkeerlijst object is mislukt"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Verzeker u ervan dat u dit daadwerkelijk wil doorvoeren, aangezien het "
-"onmogelijk is voor GOsa om de data terug te halen."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Fax blokkades"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
-"om te annuleren."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Naam"
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Blokkeerlijst beheer"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+#, fuzzy
+msgid "Blocklist type"
+msgstr "Blokkeerlijst naam"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4195,12 +4600,12 @@ msgstr "Ga een afdeling omhoog"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr "Omhoog"
 
@@ -4334,7 +4739,7 @@ msgstr "Verwerk afdeling"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "Bewerk"
 
@@ -4361,7 +4766,7 @@ msgstr "Bewerk gebruiker"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "Verwijder"
 
@@ -4376,7 +4781,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Fax nummer waarop GOfax moet reageren"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Taal"
@@ -4386,6 +4793,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Specificeer de GOfax communicatie taal voor de Fax naar E-mail gateway"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Aflever formaat"
 
@@ -4410,6 +4818,7 @@ msgid "Deliver fax as mail"
 msgstr "Lever Fax als E-mail af"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Lever Fax af op printer"
 
@@ -4549,6 +4958,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Samba Instellingen"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Toon ontvangst blokkeerlijsten"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Toon verstuur blokkeerlijsten"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4708,39 +5136,16 @@ msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
 msgid "Y-M-D"
 msgstr "J-M-D"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Naam"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Fax rapporten"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Geinstalleerde apparaten"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4869,7 +5274,7 @@ msgstr "Plaats"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Land"
 
@@ -5581,7 +5986,8 @@ msgid "Notifications"
 msgstr "Beroep"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Groepen"
@@ -5665,12 +6071,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5804,6 +6210,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Algemene wachtrij instellingen"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Leden zitten in een telefoon beantwoordgroep"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Nagios account"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Groepsleden"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Samba groep"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Distributie focus"
@@ -5824,7 +6260,8 @@ msgstr "Categorie toevoegen"
 msgid "Available applications"
 msgstr "Beschikbare programma's"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "alleen lezen"
 
@@ -5840,7 +6277,8 @@ msgstr "alleen afleveren"
 msgid "append"
 msgstr "afleveren, lezen & kopieren"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
@@ -5881,6 +6319,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Selecteer a.u.b. een geldig mailserver"
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Groepnaam"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Alternatieve adressen"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Primair adres"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Rechten"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Map beheerders"
@@ -5972,18 +6431,6 @@ msgstr "Toon gebruikers van afdeling"
 msgid "Regular expression for matching user names"
 msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Programma opties"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Toon adressen van afdeling"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Toon overeenkomende adressen"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Deze 'dn' is geen programmagroep"
@@ -6093,6 +6540,40 @@ msgstr ""
 "Kon distributienaam '%s' moet vinden. Distributienaam is ingesteld op '%s'. "
 "De basis van het object is mogelijk gewijzigd."
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Toon programma's"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Programma"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Programmanaam"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Programma opties"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Toon adressen van afdeling"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Toon overeenkomende adressen"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Groep instellingen"
@@ -6178,14 +6659,6 @@ msgstr "Nieuwe groep aanmaken"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Programma"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6300,6 +6773,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -6458,7 +6932,9 @@ msgid "Application name"
 msgstr "Programmanaam"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Getoonde naam"
 
@@ -6468,6 +6944,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Te tonen programma naam (bv. onder iconen)"
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6487,7 +6964,9 @@ msgid "Choose subtree to place application in"
 msgstr "Selecteer de subtree waaronder het programma geplaatst zal worden."
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icoon"
 
@@ -6501,22 +6980,27 @@ msgid "Reload picture from LDAP"
 msgstr "Herlaad plaatje vanuit LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Alleen uitvoerbaar voor groepsleden"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Vervang gebruikers configuratie bij opstarten"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Plaats icoon op de desktop van groepsleden"
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Plaats programma in het startmenu van groepsleden"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Plaats invoer in snelstartbalk van groepsleden"
 
@@ -6558,6 +7042,7 @@ msgstr ""
 "knop hieronder te gebruiken."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variabele"
 
@@ -6663,6 +7148,20 @@ msgstr "Het opslaan van het programma is mislukt"
 msgid "Application settings"
 msgstr "Programma instellingen"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Programmanaam"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Variabele inhoud"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6727,6 +7226,7 @@ msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Categorie"
 
@@ -6760,6 +7260,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Basis Fax nummer van deze subtree"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Administratieve instellingen"
 
@@ -6768,10 +7269,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 "Het verplaatsen van de tree is mislukt. Bestemmings-tree is een subtree van "
@@ -6828,26 +7329,26 @@ msgstr ""
 msgid "Department management"
 msgstr "Afdeling beheer"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Het verwijderen van de afdeling is mislukt"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Er bestaat al een afdeling met deze 'Naam'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Vereist veld 'Omschrijving' is leeg."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -6855,47 +7356,61 @@ msgstr ""
 "Het veld 'Naam' bevat het gereserveerde woord '%s'. Kies a.u.b. een andere "
 "naam."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
 "eenheid te markeren!"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Het opslaan van de afdeling is mislukt"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markeren van '%s'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Object"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Afdelingen"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Telefoon"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Afdelingnaam"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6911,20 +7426,6 @@ msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Telefoon"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Afdelingnaam"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6975,6 +7476,7 @@ msgid "Enable DNS for this device"
 msgstr "DNS voor dit apparaat activeren"
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6987,6 +7489,8 @@ msgstr "Zone"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -7056,11 +7560,14 @@ msgid "Terminal Service"
 msgstr "Terminal Service"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Schakel inlog mogelijkheid tijdelijk uit"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Fontpad"
@@ -7229,8 +7736,11 @@ msgstr "Selecteer de subtree waar de terminal onder geplaatst zal worden"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Modus"
 
@@ -7242,7 +7752,9 @@ msgstr "Selecteer terminal modus"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Syslog server"
 
@@ -7253,6 +7765,7 @@ msgid "Choose server to use for logging"
 msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Root server"
 
@@ -7261,6 +7774,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Swap server"
 
@@ -7408,6 +7922,128 @@ msgstr "Geef a.u.b. een geldig HSync bereik op."
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Het opslaan van terminal service informatie is mislukt"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Services"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Terminal Service"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Monitor grootte"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "methode"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Remote desktop"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nieuw stuurprogramma"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolutie"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Kleurdiepte"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Print service"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Spool server"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "gedeactiveerd"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "gedeactiveerd"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Kies toetsenbord model"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Kies toetsenbord indeling"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Kies toetsenbord variant"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "MIME-type"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Koppelpunt"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Telefoon hardware"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7423,6 +8059,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Het opslaan van terminal opstart instellingen is mislukt"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Terminal sjabloon"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Ldap server"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Boot kernel"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Controleer parameter"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Servernaam"
@@ -7440,6 +8099,7 @@ msgid "Workstation template"
 msgstr "Werkstation sjabloon"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Werkstation naam"
 
@@ -7469,10 +8129,6 @@ msgstr "Printer URL"
 msgid "Driver"
 msgstr "Stuurprogramma"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Rechten"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Gebruikers die deze printer mogen gebruiken"
@@ -7587,6 +8243,38 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Terminal Service"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Syslog server"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Gebruikersinstellingen"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Actie"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7655,6 +8343,17 @@ msgstr ""
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Servernaam"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "naar map"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Verwijder DHCP service"
@@ -7710,13 +8409,32 @@ msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Het opslaan van werkstations services is mislukt"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systemen"
-
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "U kunt dit object type nog niet bewerken!"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Werkstation naam"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Werkstation"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "NTP tijdserver"
+
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systemen"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "U kunt dit object type nog niet bewerken!"
 
 #: plugins/admin/systems/class_systemManagement.inc:236
 msgid "Passwords entered as new and repeated do not match!"
@@ -7767,19 +8485,6 @@ msgstr "Werkstation sjabloon voor"
 msgid "New System from incoming"
 msgstr "Nieuw systeem uit inkomende wachtrij"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Werkstation"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr "Werkstation wordt momenteel geinstalleerd"
@@ -7827,6 +8532,7 @@ msgid "Zones"
 msgstr "Zones"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix mydomain"
 
@@ -7835,22 +8541,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix mydestination"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "POP3 service"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "POP3/SSL service"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "IMAP Service"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "IMAP/SSL service"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Sieve service"
 
@@ -7868,6 +8579,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Amavis email scannen (virus/anti-spam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Quota instellingen"
 
@@ -7880,6 +8592,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "SMTP toegestane netwerken"
 
@@ -7904,6 +8617,7 @@ msgid "Host used to relay mails"
 msgstr "Host die gebruikt wordt om E-mails te relayen"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Accepteer Internet E-mail"
 
@@ -7942,6 +8656,7 @@ msgstr ""
 "door de knop hieronder te gebruiken."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Reverse zone"
 
@@ -7980,10 +8695,50 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
 msgid "DNS service"
 msgstr "Voeg DNS service toe"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Zone-naam"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Primaire DNS server voor deze zone"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Serieel"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Opnieuw proberen"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Vervaltijd"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Zone records"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Kerberos kadmin toegang"
@@ -7995,6 +8750,7 @@ msgstr "Kerberos Realm"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Beheerder"
 
@@ -8031,16 +8787,19 @@ msgstr "IMAP beheerder toegang"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Server identificatie"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Verbindingings URL"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Sieve poort"
 
@@ -8061,6 +8820,7 @@ msgid "Glpi database"
 msgstr "Glpi database"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Database"
@@ -8069,6 +8829,78 @@ msgstr "Database"
 msgid "Machine name"
 msgstr "Machinenaam"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "IMAP Service"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "FAX database"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
+"bestaat niet."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Fax server"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Sieve service"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Naam van de locatie"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 #, fuzzy
 msgid ""
@@ -8139,6 +8971,39 @@ msgstr "Voeg Kolab service toe"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Voeg Kolab service toe"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Doel"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "HTTP Free/Busy service (vervallen)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Lijst herladen"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "HTTP Free/Busy service (vervallen)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8261,6 +9126,20 @@ msgstr ""
 msgid "Group"
 msgstr "Groep"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Print Service"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Printer"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8304,6 +9183,65 @@ msgstr "Het veld IP adres bevat een ongeldig adres."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Nieuw component"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Netwerk apparaten"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Kies het type systeem component dat u wenst aan te maken"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Linux terminals en werkstations worden automatisch aangemaakt bij het "
+"opstarten. Om deze reden kunt u alleen sjablonen voor een specifieke tree "
+"aanmaken. Servers worden normaliter ook automatisch toegevoegd, maar in "
+"sommige speciale gevallen moet u nep server informatie invoeren zodat GOsa "
+"met de server informatie kan werken. Andere netwerk componenten kunnen "
+"gebruikt worden binnen Nagios omgevingen om component afhankelijkheden te "
+"kunnen creëren."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Linux thin client sjabloon"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Linux werkstation sjabloon"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Linux server"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Windows werkstation"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Netwerk printer"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Ander netwerk component"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Aanmaken"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
 msgid "Time server"
@@ -8314,6 +9252,7 @@ msgid "Printer type"
 msgstr "Printertype"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8327,6 +9266,7 @@ msgstr "Printertype"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr "Fabricant"
@@ -8335,10 +9275,6 @@ msgstr "Fabricant"
 msgid "Supported interfaces"
 msgstr "Ondersteunde interfaces"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Serieel"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr "Parallel"
@@ -8352,11 +9288,15 @@ msgid "Contacts"
 msgstr "Contacten"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr "Technisch verantwoordelijke"
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Contactpersoon"
 
@@ -8368,76 +9308,29 @@ msgstr "Bijlagen"
 msgid "Installed cartridges"
 msgstr "Geinstalleerde cartridges"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Kies het type systeem component dat u wenst aan te maken"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
+msgstr "Bewerk share"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Linux terminals en werkstations worden automatisch aangemaakt bij het "
-"opstarten. Om deze reden kunt u alleen sjablonen voor een specifieke tree "
-"aanmaken. Servers worden normaliter ook automatisch toegevoegd, maar in "
-"sommige speciale gevallen moet u nep server informatie invoeren zodat GOsa "
-"met de server informatie kan werken. Andere netwerk componenten kunnen "
-"gebruikt worden binnen Nagios omgevingen om component afhankelijkheden te "
-"kunnen creëren."
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr "NFS instellingen"
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Linux thin client sjabloon"
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
+msgid "Volume"
+msgstr "Volume"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Linux werkstation sjabloon"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr "Auto-mount share op Apple systemen"
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Linux server"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Windows werkstation"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Netwerk printer"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Ander netwerk component"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Aanmaken"
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr "Bewerk share"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr "NFS instellingen"
-
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Volume"
-msgstr "Volume"
-
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr "Auto-mount share op Apple systemen"
-
-#: plugins/admin/systems/servnfs.tpl:94
-msgid "Codepage"
-msgstr "Karakterset"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
+msgstr "Karakterset"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Option"
 msgstr "Optie"
 
@@ -8447,10 +9340,12 @@ msgid "System type"
 msgstr "Systeemtype"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "Besturingssysteem"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8548,6 +9443,35 @@ msgstr ""
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Telefoonnummer"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Telefoon hardware"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "DTMF modus"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Standaard IP"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8589,6 +9513,20 @@ msgstr "Het pad bevat ongeldige karakters."
 msgid "Option contains invalid characters."
 msgstr "De optie bevat ongeldige karakters."
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Voeg DNS service toe"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8654,6 +9592,35 @@ msgstr ""
 "De in uw 'gosa.conf' opgegeven REPOSITORY_HOOK '%s' geeft een lege waarde "
 "terug."
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Systeem status"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Controleer parameter"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "FAI klassen"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Huidige uitgave"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Geavanceerde telefoon instellingen"
@@ -8676,10 +9643,6 @@ msgstr "Kies een telefoontype"
 msgid "refresh"
 msgstr "ververs"
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "DTMF modus"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8818,6 +9781,7 @@ msgstr "Het ge-uploade ppd bestand is leeg. Kan geen nieuw ppd bestand maken."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Sectie"
 
@@ -8844,6 +9808,7 @@ msgstr "Printer stuurprogramma"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Model"
 
@@ -8891,6 +9856,11 @@ msgstr "Printer PPD selectie"
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Het opslaan van werkstations services is mislukt"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Werkstation naam"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8941,13 +9911,6 @@ msgstr "Poort"
 msgid "Choose mouse port"
 msgstr "Kies muispoort"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Telefoon hardware"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -9018,11 +9981,6 @@ msgstr "Lever scan diensten"
 msgid "Boot parameters"
 msgstr "Opstart parameters"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Boot kernel"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -9051,7 +10009,9 @@ msgstr "FAI server"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Distributie versie"
@@ -9106,10 +10066,6 @@ msgstr "Selecteer om meer uitvoer te produceren tijdens opstarten"
 msgid "use debug mode for startup"
 msgstr "Gebruik debug modus bij boot"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Remote desktop"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Verbindings methode"
@@ -9146,10 +10102,6 @@ msgstr "Selecteer om de IPP gebaseerde print service te starten op de terminal"
 msgid "Provide print services"
 msgstr "Lever print diensten"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Spool server"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr "Selecteer NFS bestandssysteem waarop spool bestanden geplaatst worden"
@@ -9159,11 +10111,13 @@ msgid "Select scanner driver to use"
 msgstr "Selecteer de te gebruiken scanner driver"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Verzamelplaats"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Hoofd/Parent server"
 
@@ -9191,6 +10145,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
 msgid "Repository service"
 msgstr "Print service"
@@ -9224,6 +10179,15 @@ msgstr "De opgegeven naam wordt al gebruikt."
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Distributie versie"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Lijst met gedefinieerde verzamelplaatsen."
@@ -9238,6 +10202,54 @@ msgstr ""
 "Dit menu maakt het mogelijk om FAI verzamelplaatsen aan te maken, bewerken "
 "en verwijderen."
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "gebruiker database"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Blokkeerlijst beheer"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Mail server"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Sieve service"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Beheerders"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "Systeemtypes beheren"
@@ -9396,6 +10408,105 @@ msgstr ""
 "Kan het GLPI account niet verwijderen, zolang er geen MySQL extensie "
 "beschikbaar is. Controleer uw PHP installatie."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Verwijder printer mogelijkheden"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Bijlage"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Bijlage"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Bijlage"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Bijlage"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Nieuwe monitor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Apparaat naam"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Moederbord toevoegen/bewerken"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Nieuwe geluidskaart"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Nieuwe processor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Nieuw overig apparaat"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Apparaat naam"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Nieuwe hardeschijf"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Apparaat naam"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Nieuwe controller"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+#, fuzzy
+msgid "Device graphics card"
+msgstr "Nieuwe grafische kaart"
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+#, fuzzy
+msgid "Device power supply"
+msgstr "Nieuwe voeding"
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Scherm"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Fabricanten beheren"
@@ -9434,6 +10545,7 @@ msgstr "Monitor toevoegen/bewerken"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Opmerkingen"
@@ -9565,6 +10677,7 @@ msgid "Add/Edit network interface"
 msgstr "Netwerkkaart toevoegen/bewerken"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
@@ -9907,6 +11020,31 @@ msgstr ""
 msgid "since"
 msgstr "sinds"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Voeg printer extensie toe"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Ondersteunde interfaces"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Ondersteunde interfaces"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Ondersteunde interfaces"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Cartridges"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9983,6 +11121,21 @@ msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Het opslaan van het E-mail account is mislukt"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Samba Instellingen"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "DNS records"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "IP adres"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr "Kan dit object niet verwijderen, aangezien deze nog in gebruik is."
@@ -10021,18 +11174,10 @@ msgstr "Reguliere expresie voor overeenkomende cartridgetypes"
 msgid "Reference"
 msgstr "Referentie"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Zone-naam"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Netwerkadres"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Zone records"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -10050,16 +11195,6 @@ msgstr "Primaire DNS server voor deze zone"
 msgid "Serial number (automatically incremented)"
 msgstr "Serienummer (automatisch opgehoogd)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Opnieuw proberen"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Vervaltijd"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "MX records"
@@ -10103,7 +11238,7 @@ msgstr "Selecteer een objectgroep"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr "Omlaag"
 
@@ -10451,62 +11586,30 @@ msgstr "Selecteer de toe te voegen printer"
 msgid "All available services are already in use."
 msgstr "De opgegeven apparaat naam wordt al gebruikt."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-#, fuzzy
-msgid "FAX service"
-msgstr "IMAP Service"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-#, fuzzy
-msgid "FAX database configuration"
-msgstr "FAX database"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "Het opslaan van het server service object is mislukt"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Het opslaan van het server service object is mislukt"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
+#: plugins/admin/systems/class_goCupsServer.inc:206
 #, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
-#, fuzzy, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
+msgid "Cups"
+msgstr "omhoog"
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
-"bestaat niet."
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Audio service"
 
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:27
@@ -10514,6 +11617,25 @@ msgstr ""
 msgid "LDAP service"
 msgstr "LDAP Service"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal server moet een fontpath hebben."
+
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 #, fuzzy
@@ -10612,36 +11734,100 @@ msgstr "Print service"
 msgid "Remove service"
 msgstr "Verwijder DNS service"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr "Stop"
+
+#: plugins/admin/systems/class_serverService.inc:8
 #, fuzzy
-msgid "Inventory database"
-msgstr "gebruiker database"
+msgid "Start"
+msgstr "Opstarten"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
+#: plugins/admin/systems/class_serverService.inc:9
 #, fuzzy
-msgid "Glpi management"
-msgstr "Blokkeerlijst beheer"
+msgid "Restart"
+msgstr "Opnieuw proberen"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "The specified method '%s' can't executed for services."
+msgstr "Het opgegeven ppd bestand '%s' kan niet geopend worden om te lezen."
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Tijd Service"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "NTP tijdserver"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, fuzzy, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "Het opslaan van het server service object is mislukt"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "Het opslaan van het server service object is mislukt"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goNtpServer.inc:219
 #, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
+msgid "NTP"
+msgstr "Ftp"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Audio service"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Ldap server"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Ldap server"
+
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
 msgstr ""
@@ -10661,6 +11847,7 @@ msgid "This value specifies the maximal header size."
 msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 #, fuzzy
 msgid "Max mailbox size"
 msgstr "E-mail grootte"
@@ -10670,6 +11857,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 #, fuzzy
 msgid "Max message size"
 msgstr "Bericht"
@@ -10679,6 +11867,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 #, fuzzy
 msgid "Relay host"
 msgstr "Lijst herladen"
@@ -10688,6 +11877,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10702,6 +11892,7 @@ msgid "Domains and routing"
 msgstr "Windows beheerders"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10724,6 +11915,7 @@ msgid "Restrictions"
 msgstr "Secties"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 #, fuzzy
 msgid "Restrictions for sender"
 msgstr "Secties voor deze versie"
@@ -10734,6 +11926,7 @@ msgid "Restriction filter"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -10759,142 +11952,37 @@ msgstr "Systeem status"
 msgid "Set status"
 msgstr "Systeem status"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr "Stop"
-
-#: plugins/admin/systems/class_serverService.inc:8
-#, fuzzy
-msgid "Start"
-msgstr "Opstarten"
-
-#: plugins/admin/systems/class_serverService.inc:9
-#, fuzzy
-msgid "Restart"
-msgstr "Opnieuw proberen"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, fuzzy, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr "Het opgegeven ppd bestand '%s' kan niet geopend worden om te lezen."
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Terminal Service"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal server moet een fontpath hebben."
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 #, fuzzy
 msgid "Start IMAP service"
 msgstr "IMAP Service"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 #, fuzzy
 msgid "Start IMAP SSL service"
 msgstr "IMAP/SSL service"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 #, fuzzy
 msgid "Start POP3 service"
 msgstr "POP3 service"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 #, fuzzy
 msgid "Start POP3 SSL service"
 msgstr "POP3/SSL service"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-#, fuzzy
-msgid "Time service"
-msgstr "Tijd Service"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
-msgid "NTP service"
-msgstr "NTP tijdserver"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Het opslaan van het server service object is mislukt"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-#, fuzzy
-msgid "The given base is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 #, fuzzy
 msgid "Logging service"
 msgstr "Log DB gebruiker"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 #, fuzzy
 msgid "Syslog service"
 msgstr "Syslog Service"
@@ -10914,11 +12002,10 @@ msgstr "Het opslaan van het server service object is mislukt"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/class_goSyslogServer.inc:204
 #, fuzzy
-msgid "enabled"
-msgstr "gedeactiveerd"
+msgid "Syslog"
+msgstr "Systeem logs"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 #, fuzzy
@@ -10957,6 +12044,26 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Font server"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Kerberos server"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "SOA record"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Account code"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10972,12 +12079,24 @@ msgstr "Het opslaan van het server service object is mislukt"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
+#: plugins/admin/systems/class_goLogDBServer.inc:215
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Algemene gebruikersinformatie"
+msgid "Log"
+msgstr "Inlognaam"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Log DB gebruiker"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "gedeactiveerd"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 #, fuzzy
 msgid "Kerberos service"
 msgstr "Kerberos server"
@@ -11017,10 +12136,10 @@ msgstr "Het opgegeven kerberos wachtwoord is leeg."
 msgid "The specified kerberos realm is empty."
 msgstr "Het opgegeven kerberos wachtwoord is leeg."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
+#: plugins/admin/systems/class_goKrbServer.inc:228
 #, fuzzy
-msgid "FAX database information"
-msgstr "Free Busy informatie"
+msgid "Realm"
+msgstr "RAM"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 #, fuzzy
@@ -11062,6 +12181,25 @@ msgstr "Geef a.u.b. een nummerieke waarde op voor verval."
 msgid "Please specify a numeric value for message size limit."
 msgstr "Geef a.u.b. een nummerieke waarde op voor verval."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Mail server"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Overdrachtstijd"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Algemene gebruikersinformatie"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 #, fuzzy
 msgid "IMAP/POP3 service"
@@ -11121,10 +12259,25 @@ msgstr "De imap verbindings string dient in eruit te zien als '%s'."
 msgid "The sieve port needs to be numeric."
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
+#: plugins/admin/systems/class_goImapServer.inc:273
+#, fuzzy
+msgid "Imap"
+msgstr "Importeren"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Imap server"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Beheerders wachtwoord"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
 #, fuzzy
-msgid "Logging database information"
-msgstr "Log database"
+msgid "FAX database information"
+msgstr "Free Busy informatie"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 #, fuzzy
@@ -11161,6 +12314,21 @@ msgstr "Het verwijderen van een mount container is mislukt"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Het opslaan van de mount container is mislukt"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Scan service"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nieuwe regel"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Log database"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11185,6 +12353,7 @@ msgid "Phone queue"
 msgstr "Telefoonwachtrij"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "Systeem"
 
@@ -11201,6 +12370,11 @@ msgstr "Er moet tenminste een NTP server geselecteerd zijn."
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "Het verwijderen van E-mail objectgroep instellingen is mislukt"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Systeem status"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Selecteer om afdelingen te zien"
@@ -11258,6 +12432,7 @@ msgid "Display objects of department"
 msgstr "Toon objecten van afdeling"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Objectgroepen"
@@ -11342,6 +12517,16 @@ msgstr "Het opslaan van de objectgroep is mislukt"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Het verwijderen van de objectgroep is mislukt"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Objectgroep"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Groepsleden"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11368,6 +12553,7 @@ msgid "Generic queue Settings"
 msgstr "Algemene wachtrij instellingen"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -11396,6 +12582,7 @@ msgid "Use music on hold instead of ringing"
 msgstr "Gebruik wachtstand muziek i.p.v. rinkelen"
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr "Wachtstand muziek"
 
@@ -11444,26 +12631,32 @@ msgid "Phone attributes "
 msgstr "Telefoon attributen "
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr "Aankondigings wachttijd"
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr "Sta de gebelde gebruiker toe het gesprek over te zetten"
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr "Sta de bellende gebruiker toe het gesprek over te zetten"
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr "Sta de gebelde gebruiker toe op te hangen door * in te drukken"
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr "Sta de bellende gebruiker toe op te hangen door * in te drukken"
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr "Rinkel i.p.v. achtergrond muziek afspelen"
 
@@ -11499,6 +12692,11 @@ msgstr "Het opslaan van de objectgroep is mislukt"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Het verwijderen van de objectgroep is mislukt"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Primaire groep"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "rinkel allemaal"
@@ -11636,6 +12834,75 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "Het verwijderen van E-mail objectgroep instellingen is mislukt"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Leden zitten in een telefoon beantwoordgroep"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Maximale wachtrij lengte"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Aankondigingsfrequentie"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Welkom %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+#, fuzzy
+msgid "Report hold time"
+msgstr "Aankondigings wachttijd"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+#, fuzzy
+msgid "'There are' sound"
+msgstr "'Er zijn ...'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+#, fuzzy
+msgid "'Call waiting' sound"
+msgstr "'...oproepen wachtend'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "'Dank U' bericht"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "'minuten' geluidsbestand"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Second' sound"
+msgstr "'seconden' geluidsbestand"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Minder Dan geluidsbestand"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Telefoonnummer"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Aankondigings bericht"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11829,12 +13096,50 @@ msgstr "Fully Automatic Installation"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Het aanmaken van de FAI script basis is mislukt"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Importeer script"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Inlogscript"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Het opslaan van de FAI sjabloon basis is mislukt"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nieuw sjabloon"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Sjabloon bundel"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Sjabloon naam"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Bestandsnaam"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Rechten"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11874,6 +13179,16 @@ msgstr "De opgegeven aftakkingsnaam is ongeldig."
 msgid "Specified freeze name is invalid."
 msgstr "De opgegeven bevriesnaam is ongeldig."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Beheer"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Blokkeerlijst beheer"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Installatie methode"
@@ -12008,71 +13323,108 @@ msgstr "Pakketbestand '%s' bestaat niet."
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Het opslaan van de FAI pakket basis is mislukt"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Pakket"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Pakketlijst"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Installatie methode"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr "Deze lijst toont alle toegekende klassenamen voor dit profiel."
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Inhakers bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Sjabloon bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Script bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Variabele bundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr "Pakketbundel"
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Partitietabel"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr "Verwijder klasse uit profiel"
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr "Ken a.u.b. tenminste een klasse toe aan dit profiel."
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Geef a.u.b. een geldige naam op"
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr "Er bestaat al een profiel met deze klassenaam."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Het opslaan van het FAI profiel is mislukt"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Profielen"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Nieuw profiel"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Het opslaan van de FAI inhaker basis is mislukt"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "FAI klassen"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "Inhakers"
+
+#: plugins/admin/fai/class_faiHook.inc:475
+#, fuzzy
+msgid "FAI hook"
+msgstr "Toon FAI inhakers"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Taak"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -12089,6 +13441,7 @@ msgid "FS type"
 msgstr "FS type"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Koppelpunt"
@@ -12099,6 +13452,7 @@ msgid "Size in MB"
 msgstr "Grootte in MB"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Koppelopties"
@@ -12186,6 +13540,7 @@ msgid "Variable attributes"
 msgstr "Variabele attributen"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Variabele inhoud"
 
@@ -12222,6 +13577,41 @@ msgstr "%s partitie(s)"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Het opslaan van de FAI partitietabel basis is mislukt"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nieuwe partitietabel"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Partitietabel"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Partities"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Systeemtype"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Partities"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "systeem informatie bekijken"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partities"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Geef a.u.b. een waarde voor script op"
@@ -12239,10 +13629,6 @@ msgstr "Klassenaam"
 msgid "Hook attributes"
 msgstr "Inhakers atributen"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Taak"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr "Kies een bestaande FAI taak"
@@ -12332,6 +13718,11 @@ msgstr "Een nieuwe klassenaam."
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Het opslaan van de FAI variabele basis is mislukt"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Toon FAI variabelen"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "nog geen bestand ge-upload."
@@ -12378,6 +13769,7 @@ msgid "Destination path"
 msgstr "Doelpad"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Eigenaar"
@@ -12447,10 +13839,6 @@ msgstr ""
 "Dit menu maakt het mogelijk om meerdere pakketten toe te voegen aan de op "
 "dit moment bewerkte pakketlijst."
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Pakket"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12738,6 +14126,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Voer a.u.b. een naam voor de conferentie in."
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Primaire groep"
@@ -12761,6 +14150,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filters"
@@ -12843,11 +14233,27 @@ msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "MIME-type"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "MIME-type"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Programma's aanmaken"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Gebruikte programma's"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -13068,6 +14474,37 @@ msgstr "Gebruiker '%s' is van telefoonwachtrij '%s' verwijderd"
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Het verwijderen van het telefoon account is mislukt"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Telefoon instellingen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Aflever methodes"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Telefoon"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#, fuzzy
+msgid "Voivemail pin"
+msgstr "Voicemail PIN-code"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Telefoonnummer"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "E-mail instellingen"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13220,6 +14657,20 @@ msgstr "Geef a.u.b. een geldige basis op."
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Het opslaan van het Open-Xchange account is mislukt"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Asterisk beheer"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Macro tekst"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr "Argument"
@@ -13344,6 +14795,7 @@ msgid "Lifetime (in days)"
 msgstr "Geldigheidsduur (in dagen)"
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr "Voorgedefinieerde PIN-code"
 
@@ -13353,6 +14805,7 @@ msgid "PIN"
 msgstr "PIN-code"
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr "Conferentie opnemen"
 
@@ -13361,6 +14814,7 @@ msgid "Sound file format"
 msgstr "Geluidsbestand formaat"
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr "Muziek afspelen bij wachtstand"
 
@@ -13377,13 +14831,10 @@ msgid "Count users"
 msgstr "Tel het aantal gebruikers"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Tel. conferenties"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Beheer"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13427,6 +14878,50 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Conferentie beheer"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Conferentie"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Activeer sessiemenu"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#, fuzzy
+msgid "Announce user activity"
+msgstr "Aankondigingsfrequentie"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Tel het aantal gebruikers"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Conferentienaam"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "formaat"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#, fuzzy
+msgid "Lifetime"
+msgstr "Geldigheidsduur (in dagen)"
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "Conferentie beheer"
@@ -13468,6 +14963,9 @@ msgid "Duration"
 msgstr "Tijdsduur"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Tel. rapporten"
 
@@ -13869,7 +15367,7 @@ msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
 msgid "References"
 msgstr "Referenties"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -13877,7 +15375,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -13885,7 +15383,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -13893,7 +15391,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -13901,62 +15399,62 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Object '%s' is al gemarkeerd"
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Toevoegen van markering (%s) aan object '%s'"
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, fuzzy, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr "Het verwerken van object markeringen is mislukt"
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Verwijderen van markering van object '%s'"
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Het opslaan van de objectgroep is mislukt"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Het verwijderen van de telefoon is mislukt"
@@ -13966,7 +15464,7 @@ msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 "Kan SSHA niet gebruiken voor encryptie. (Ontbrekende functie mhash / sha1)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -13974,12 +15472,12 @@ msgstr ""
 "Uw gosa.conf is gedeeltelijk veranderd. Converteer het a.u.b. met het "
 "meegeleverde script fix_config.sh!"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -14055,7 +15553,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML fout in gosa.conf: %s op regel %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
@@ -14624,7 +16122,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "De aanmelding op de LDAP server is mislukt. De reden was: '%s'."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14749,120 +16247,120 @@ msgstr ""
 msgid "Access control"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Log prioriteit"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Subonderdelen negeren"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Bewerken"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Verwijderen"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Bewerk klasse"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Het opslaan van de ACL informatie is mislukt"
@@ -14969,26 +16467,26 @@ msgstr "Kan '%s' niet openen. Het is mogelijk dat het bestand niet bestaat."
 msgid "Can't read file '%s', check permissions."
 msgstr "Kan bestand '%s' niet openen. Controleer de bestandspermissies a.u.b."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "De sessie zal niet versleuteld zijn."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -14996,31 +16494,31 @@ msgstr ""
 "GOsa kon geen informatie ophalen over geinstalleerde schema bestanden. Zorg "
 "er a.u.b. voor dat dit mogelijk is."
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Uw LDAP installatie bevat oude schema definities. Draai het installatie "
 "programma a.u.b. opnieuw."
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 "Account is geblokkeerd. Neem a.u.b. contact op met de systeembeheerder."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15350,10 +16848,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "Beheerders DN"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Beheerders wachtwoord"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15666,8 +17160,36 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Quota grootte"
+#~ msgid "Day"
+#~ msgstr "dag"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Kies toetsenbord model"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Kies toetsenbord variant"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Volume"
+
+#, fuzzy
+#~ msgid "Technical responsilbe"
+#~ msgstr "Technisch verantwoordelijke"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Server identificatie"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Standaard certificaat"
 
 #, fuzzy
 #~ msgid "Vocation message"
@@ -15883,9 +17405,6 @@ msgstr ""
 #~ "Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze "
 #~ "uitschakelen door de knop hieronder te gebruiken."
 
-#~ msgid "Add Kolab service"
-#~ msgstr "Voeg Kolab service toe"
-
 #~ msgid ""
 #~ "This server has kolab features disabled. You can enable them by clicking "
 #~ "below."

diff --git a/locale/pl/LC_MESSAGES/messages.mo b/locale/pl/LC_MESSAGES/messages.mo
index 87b670fffb0726f0c4a62cce74d019f065ea85bd..2ea8dbf56668d377ae38c9930da694c3e8acf660 100644 (file)
Binary files a/locale/pl/LC_MESSAGES/messages.mo and b/locale/pl/LC_MESSAGES/messages.mo differ

diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po
index 0aa5f0d8e3ad5381d13c9f5cce9b373ad2870549..29dba0fd9b75f854263db085f67e50eb1fb8e913 100644 (file)
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -1,10 +1,12 @@
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2006-07-01 22:33+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -16,7 +18,7 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Moje konto "
 
@@ -25,6 +27,7 @@ msgid "Administration"
 msgstr "Administracja"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Dodatki"
 
@@ -36,18 +39,29 @@ msgstr "Dodatki"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -57,7 +71,9 @@ msgstr "Dodatki"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Ogólne"
@@ -68,6 +84,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -75,16 +92,21 @@ msgstr "Środowisko"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Poczta"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -99,23 +121,28 @@ msgstr "Netatalk"
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Połączenia"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -127,16 +154,19 @@ msgstr "Fax"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Telefon"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr "Nagios"
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -160,6 +190,8 @@ msgid "Parameter"
 msgstr "Parametr"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Startup"
@@ -171,8 +203,9 @@ msgstr "Urządzenia"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -242,6 +275,7 @@ msgstr "Partycje"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -269,7 +303,7 @@ msgstr "Profile"
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Pakiety"
 
@@ -384,7 +418,7 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -430,12 +464,12 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -491,9 +525,9 @@ msgstr "Dodaj"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -517,8 +551,8 @@ msgstr "Dodaj"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -529,8 +563,8 @@ msgstr "Dodaj"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -564,6 +598,7 @@ msgstr "Adres podstawowy"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -587,8 +622,9 @@ msgid "not defined"
 msgstr "nie zdefiniowane"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Rozmiar Quoty"
 
@@ -705,14 +741,14 @@ msgstr "Odrzuć pocztę większą niż"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "MB"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Treść autorespondera"
 
@@ -742,7 +778,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Użyj własnego skryptu SIEVE"
 
@@ -762,7 +798,7 @@ msgstr "Wyłącza wszystkie opcje poczty!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -810,7 +846,7 @@ msgid "User mail settings"
 msgstr "Ustawienia poczty użytkownika"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
@@ -865,27 +901,27 @@ msgstr "To robi coś"
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "Nie ma takiego trybu poczty '%s' podanego w Twoim pliku gosa.conf."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Nie można pobrać informacji o quota dla '%s'."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "Brak znacznika DESC w pliku autorespondera"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "To konto nie posiada rozszerzeń pocztowych"
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Usuń konto pocztowe"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -893,13 +929,13 @@ msgid ""
 msgstr ""
 "To konto posiada rozszerzenia poczty. Można je wyłączyć klikając poniżej."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Stwórz konto pocztowe"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -907,18 +943,18 @@ msgid ""
 msgstr ""
 "To konto nie posiada rozszerzenia poczty. Można je włączyć klikając poniżej."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr "Dodawanie swojego własnego adresu do przekierowanych nie ma sensu."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -926,69 +962,69 @@ msgid ""
 msgstr ""
 "Próbujesz dodać nieprawidłowy adres email do listy adresów alternatywnych."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr "Adres który próbujesz dodać jest już używany"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Usuwanie konta pocztowego nieudane"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Zapisywanie konta pocztowego nieudane"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Brak poprawnego serwera pocztowego, proszę go dodać w ustawieniach systemu."
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Wymaganie pole 'Podstawowy adres' jest puste."
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "Proszę podać prawidłowy adres email w polu 'Podstawowy adres'"
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "Podstawowy adres który podano jest już w użyciu."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "Wartość 'Rozmiar Quota' jest nieprawidłowa"
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Proszę podać prawidłowy rozmiar poczty która ma być odrzucana."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Podano parametry Spamu, ale nie wybrano folderu."
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr "Oczekiwanie aż kolab usunie właściwości poczty."
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
@@ -996,62 +1032,67 @@ msgstr ""
 "Proszę najpierw usunąć konto pocztowe, aby umożliwić kolab usuwanie swoimi "
 "metodami."
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Adres email"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Serwer pocztowy"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "Rozmiar poczty"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Adres podstawowy"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Odrzuć pocztę większą niż"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
 msgid "Spam level"
 msgstr "Poziom logu"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Max rozmiar skrzynki"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Adresy alternatywne"
@@ -1138,10 +1179,15 @@ msgstr "Wróć"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1197,8 +1243,8 @@ msgid "External password changer reported a problem: "
 msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1206,16 +1252,17 @@ msgid "Home directory"
 msgstr "Katalog domowy"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Shell"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Grupa podstawowa"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1235,6 +1282,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1253,7 +1301,7 @@ msgid "Account"
 msgstr "Konto"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
@@ -1632,54 +1680,54 @@ msgstr "Wartość podana jako 'shadowMin' powinna być mniejsza niż 'shadowMax'
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "Konto GLPI"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupa"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Shadowing"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Shadowing"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Shadowing"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Shadowing"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Pokaż pakiety"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Pokaż ludzi"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Zaufanie systemowe"
@@ -1711,7 +1759,7 @@ msgid "Allow user to change password from client"
 msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "Logowanie z klienta windows nie wymaga hasła"
 
@@ -1720,7 +1768,7 @@ msgid "Temporary disable samba account"
 msgstr "Tymczasowo wyłącz konto samba"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Domena"
 
@@ -1729,12 +1777,12 @@ msgid "Terminal Server"
 msgstr "Terminal Server"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Zezwól na logowanie do serwera terminali"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Odziedzicz konfigurację klienta"
 
@@ -1799,17 +1847,17 @@ msgid "Reconnect if disconnected"
 msgstr "Połącz jeśli rozłączono"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr "Ogranicz czas logowania"
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr "Ogranicz czas wylogowania"
 
@@ -1822,7 +1870,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Zezwól na połączenia tylko z tych stacji"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Ustawienia Samba"
 
@@ -1947,41 +1995,41 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Zapisywanie konta Samba nieudane"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "Konto wygasa po"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "Hasło wygasa"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Katalog domowy"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Ścieżka do skryptu"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Ścieżka do profilu"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Zezwól na połączenia tylko z tych stacji"
@@ -2023,63 +2071,59 @@ msgstr "nieprawidłowy"
 msgid "No certificate installed"
 msgstr "Brak zainstalowanych certyfikatów"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Usuwanie konta ogólnego użytkownika nieudane"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Zapisywanie konta ogólnego użytkownika nieudane"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "Komunikacja z bazą Kerberos nieudana"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr "Nie można usunąć użytkownika z bazy Kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr "nie można dodać użytkownika do bazy Kerberos."
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "Brak uprawnień do tworzenia konta w tym 'Kontenerze'."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "Brak uprawnień do przenoszenia konta z obecnego 'Kontenera'."
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Już istnieje osoba z takim samym loginem w bazie."
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "Wymagane pole 'Podana nazwa' jest puste."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr "Wymagane pole 'Login' jest puste."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr "Już istnieje osoba z tą 'Nazwą'/'Podaną nazwą' w bazie."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2087,109 +2131,109 @@ msgstr ""
 "Pole 'Login' zawiera niedozwolone znaki. Tylko małe litery, liczny i "
 "myślniki są dozwolone."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Pole 'Strona WWW' zawiera niepoprawną definicję URL."
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Pole 'Podana nazwa' zawiera niedozwolone znaki."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Pole 'Telefon' zawiera nieprawidłowy numer telefonu."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Pole 'Fax' zawiera nieprawidłowy numer telefonu."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Pole 'Komórka' zawiera nieprawidłowy numer telefonu."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Pole 'Pager' zawiera nieprawidłowy numer telefonu."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 msgid "Could not open specified certificate!"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Pełniona funkcja"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2200,69 +2244,111 @@ msgstr "Kod pocztowy"
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia kolejki"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Kontener"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Wyczyść hasło"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 msgid "Surename"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Imię"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Informacja o użytkowniku"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organizacja"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2275,188 +2361,160 @@ msgstr "Organizacja"
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Nadawca"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Nazwa departamentu"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Stan"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Zdjęcie użytkownika"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Standardowy certyfikat"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Numer seryjny"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Standardowy certyfikat"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Osobiste zdjęcie"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Zmień zdjęcie"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 msgid "Template name"
 msgstr "Nazwa Szablonu"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Imię"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Login"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Ustaw"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 msgid "Preferred langage"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Kontener"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Wybierz poddrzewo do umieszczenia konta."
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2480,67 +2538,69 @@ msgstr "Wybierz poddrzewo do umieszczenia konta."
 msgid "Select a base"
 msgstr "Wybierz bazę"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Edytuj certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Edytuj właściwości"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2548,7 +2608,7 @@ msgstr "Komórka"
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Proszę użyć zakładki telefony"
 
@@ -2585,8 +2645,8 @@ msgstr "Usuń obrazek"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2615,7 +2675,7 @@ msgstr "Standardowy certyfikat"
 #: 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:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2649,10 +2709,6 @@ msgstr "Nmer seryjny certyfikatu"
 msgid "User settings"
 msgstr "Ustawienia użytkownika"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Zdjęcie użytkownika"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Wyczyść hasło"
@@ -2716,6 +2772,7 @@ msgid "Temporary disable FTP access"
 msgstr "Tymczasowo wyłącz dostęp do FTP"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Konto Proxy"
 
@@ -2728,6 +2785,7 @@ msgid "Limit proxy access to working time"
 msgstr "Ogranicz dostęp do proxy do czasu pracu"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Ogranicz użycie proxy mechanizmami quota"
 
@@ -2739,16 +2797,39 @@ msgstr "na"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Usuwanie konta PHPgw nieudane"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Zapisywanie konta PHPgw nieudane"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Ustawienia grupy"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "Konto wygasa po"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Konto"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Konto PHPGroupware"
@@ -2767,6 +2848,7 @@ msgstr ""
 "dodaniu konta pocztowego."
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 msgid "Delegations"
 msgstr "Delegacje"
 
@@ -2802,15 +2884,17 @@ msgid "Invitation policy"
 msgstr "Polityka zapraszania"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr "Próbujesz dodać nieprawidłowy adres email do listy delegacji."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2818,122 +2902,184 @@ msgstr ""
 "Adres email, który próbujesz dodać nie jest podstawowym adresem istniejącego "
 "użytkownika."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr "Zawsze akceptuj"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr "Zawsze odrzuć"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 msgid "Reject if conflicts"
 msgstr "Odmów jeśli koliduje"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr "Ustaw ręcznie jeśli koliduje"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 msgid "Manual"
 msgstr "Ręczne"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Usuwanie konta ogólnego użytkownika nieudane"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "Wartość podana jako przyszłość FreeBusy musi być liczbą."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Wartość podana jako informacyjny URL FreeBusy jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr "Polityka zapraszania dla adresu '%s' jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr "Brak użytkownika pocztowego o adresie '%s' dla polityki zapraszania!"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Zapisywanie konta Kolab nieudane"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Konto Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Pocztowa lista dystrybucyjna"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Informacja FreeBusy"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Usuwanie konta webDAV nieudane"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Zapisywanie konta webDAV nieudane"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Konto WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Usuwanie konta pureftpd nieudane"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Wartość podana jako 'Przepustowość wysyłania' jest nieprawidłowa"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Wartość podana jako 'Przepustowość ściągania' jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "Wartość podana jako 'Pliki' jest nieprawidłowa"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "Wartość podana jako 'Rozmiar' jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Wartość podana jako 'Proporcja' jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Zapisywanie konta pureftpd nieudane"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Konto WebDAV"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Konto Open-Xchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "Typ FS"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
-"wyłączone, nie wykryto wsparcia dia PostgreSQL, lub podana baza nie jest "
-"osiągalna"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Utwórz konto fax"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Rozmiar Quoty"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Wgraj"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Rozmiar Quoty"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Konfiguracja pobierania"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Przepustowość wysyłania"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Przepustowość ściągania"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Konto Open-Xchange"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+"wyłączone, nie wykryto wsparcia dia PostgreSQL, lub podana baza nie jest "
+"osiągalna"
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -2963,48 +3109,78 @@ msgstr "Strefa czasowa użytkownika"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 msgid "Couldn't connect to postgresql database!"
 msgstr "Nie można połączyć się z bazą PostgreSQL!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr "Brak wymaganych parametrów dla plugina połączeń openXchange!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "Brak modułu PHP do bazy PostgreSQL!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Usuwanie książki adresowej oxchange nieudane"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 "Nazwa konta Open-Xchange jest pusta więc nieprawidłowa!. Proszę sprawdzić czy"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr "nie są używane żadne dziwne znaki w loginie."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Zapisywanie konta oxchange nieudane"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Zapisywanie konta oxchange nieudane"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "OpenXchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "konto Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Dni spotkania"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Dni robocze"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "włączone"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Strefa czasowa użytkownika"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Konto Intranet"
@@ -3013,94 +3189,145 @@ msgstr "Konto Intranet"
 msgid "This account has no connectivity extensions."
 msgstr "To konto nie posiada rozszerzeń do Połączeń"
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Połączenia"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Połączenia"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "KB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "GB"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "godzina"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "dzień"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "tydzień"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "miesiąc"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Usuwanie konta proxy nieudane"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr "Wartość numeryczna dla ustawień Quoty jest pusta."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Wartość numeryczna dla ustawień Quoty jest nieprawidłowa."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Zapisywanie konta proxy nieudane"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Ogranicz dostęp do proxy do czasu pracu"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Quota profili"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Okres powiadamiania o hoście"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "Konto PPTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr "Inranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Usuwanie konta intranet nieudane"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Zapisywanie konta intranet nieudane"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Konto Intranet"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Konto Intranet"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "Konto GLPI"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Usuwanie konta PPTP nieudane"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Zapisywanie konta PPTP nieudane"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 msgid "Opengroupware"
 msgstr "Opengroupware"
 
@@ -3124,6 +3351,7 @@ msgid "Teams"
 msgstr "Zespoły"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 msgid "PHPscheduleit account"
 msgstr "konto PHPscheduleit"
 
@@ -3131,21 +3359,31 @@ msgstr "konto PHPscheduleit"
 msgid "PHPscheduleit"
 msgstr "PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Usuwanie konta PHPscheduleit nieudane"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Zapisywanie konta PHPscheduleit nieudane"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPscheduleit"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Konto Opengroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
@@ -3153,7 +3391,7 @@ msgstr ""
 "OpenGroupware: Brak rozszerzenia postgresql. Nie można wykonywać zadnych "
 "zapytań do bazy danych."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
@@ -3161,7 +3399,7 @@ msgstr ""
 "OpenGroupware: Brak konfiguracji bazy dla OpenGroupware. Nie można pobierać "
 "ani wysyłać żadnych informacji."
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3169,6 +3407,16 @@ msgstr ""
 "OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
 "parametry konfiguracji."
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Konto Opengroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Konto Opengroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "Rozszerzenie Środowisko jest obecnie wyłączone"
@@ -3200,7 +3448,7 @@ msgid "Profil quota"
 msgstr "Quota profili"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr "Buforu profil lokalnie"
 
@@ -3209,7 +3457,7 @@ msgid "Kiosk profile settings"
 msgstr "Ustawienia profilu Kiosk"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr "Profil Kiosk"
 
@@ -3218,24 +3466,26 @@ msgid "Manage"
 msgstr "Zarządzaj"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr "Rozdzielczość zmienialna podczas pracy"
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Udziały"
 
@@ -3476,26 +3726,30 @@ msgid "Administrator"
 msgstr "Administrator"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Domyślna drukarka"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Ustawienia środowiska użytkownika"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Serwer plików"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Quota profili"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Skrypt logowania"
@@ -3540,28 +3794,51 @@ msgstr "Nazwa skryptu"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3597,7 +3874,7 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3692,30 +3969,37 @@ msgid "Nagios Account"
 msgstr "Konto Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Okres powiadamiania o hoście"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Okres powiadamiania o usłudze"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Opcje powiadamiania o usłudze"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Opcje powiadamiania o hoście"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Polecenia powiadamiania o usłudze"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Polecenia powiadamiania o hoście"
 
@@ -3801,6 +4085,46 @@ msgstr "Proszę podać poprawny adres email w polu 'NagiosMail'"
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Usuwanie konta Nagios nieudane"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Ustawienia nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "pokaż wszystkie hosty"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "pokaż wszystkie usługi"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "przełącz polecenia systemu"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "przełącz wszystkie polecenia hosta"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "przełącz wszystkie polecenia usługi"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Pokaż konfigurację"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "pokaż informacje o systemie"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Ustawienia nagios"
@@ -3854,12 +4178,26 @@ msgstr "Zapisywanie konta Netatalk nieudane"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Usuwanie konta Netatalk nieudane"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Katalog domowy"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Udział"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -3877,13 +4215,16 @@ msgstr "Sybierz poddrzewo do umiszczenia bloklisty"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3907,7 +4248,47 @@ msgstr "Blokowane numery"
 msgid "Numbers can also contain wild cards."
 msgstr "Numery mogą również zawierać maski"
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
+"możliwości odwrócenia tego procesu."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
+"anulować."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Zarządzanie bloklistą"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Bloklisty FAX"
 
@@ -3937,70 +4318,95 @@ msgstr "odbieranie"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Usuwanie obiektu bloklisty nieudane"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Wymaganie pole 'Nazwa' zawiera niedozwolone znaki"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "Podana nazwa jest już używana."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Zapisywanie obiektu bloklisty nieudane"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Proszę upewnić się, że faktycznie chcesz wykonać tą operację. Nie ma "
-"możliwości odwrócenia tego procesu."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Bloklisty FAX"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
-"anulować."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Imię"
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Zarządzanie bloklistą"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+#, fuzzy
+msgid "Blocklist type"
+msgstr "Nazwa bloklisty"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
@@ -4139,12 +4545,12 @@ msgstr "Idź jeden departament wyżej"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr "Góra"
 
@@ -4278,7 +4684,7 @@ msgstr "Zatwierdź departament"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 msgid "edit"
 msgstr "edytuj"
 
@@ -4305,7 +4711,7 @@ msgstr "Edytuj użytkownika"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 msgid "delete"
 msgstr "Usuń"
 
@@ -4320,7 +4726,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numer faxu dla GOfax dla przełączenia"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Język"
@@ -4330,6 +4738,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Podaj język komunikacji GOfax dla bramki fax2mail"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Format dostarczania"
 
@@ -4354,6 +4763,7 @@ msgid "Deliver fax as mail"
 msgstr "Dostarcz fax jako pocztę"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Dostarcz fax na drukarkę"
 
@@ -4489,6 +4899,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Zapisywanie konta ogólnego użytkownika nieudane"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Ustawienia Samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Pokaż bloklisty otrzymywania"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Pokaż bloklisty wysyłania"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4646,39 +5075,16 @@ msgstr "Brak uprawnień do pobierania informacji o tym faxie!"
 msgid "Y-M-D"
 msgstr "R-M-D"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Imię"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Raporty FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Zainstalowane urządzenia"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4806,7 +5212,7 @@ msgstr "Miasto"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Kraj"
 
@@ -5508,7 +5914,8 @@ msgid "Notifications"
 msgstr "Wywołanie"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Grupy"
@@ -5591,12 +5998,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5729,6 +6136,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Wartość podana jako 'Nazwa' jest już użyta."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Ogólne ustawienia kolejki"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Członkowie są w grupie odbioru telefonu"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Konto Nagios"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Członkowie grupy"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Grupa Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Skupienie wydania"
@@ -5749,7 +6186,8 @@ msgstr "Dodaj kategorię"
 msgid "Available applications"
 msgstr "Dostępne aplikacje"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "czytanie"
 
@@ -5765,7 +6203,8 @@ msgstr "wysyłanie zewnętrzne"
 msgid "append"
 msgstr "dołączanie"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "zapisywanie"
 
@@ -5805,6 +6244,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Proszę wybrać prawidłowy serwer pocztowy."
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nazwa grupy"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Adresy alternatywne"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Adres podstawowy"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+msgid "Permissions"
+msgstr "Uprawnienia"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Administratorzy foldera"
@@ -5894,18 +6354,6 @@ msgstr "Wyświetl użytkowników departamentu"
 msgid "Regular expression for matching user names"
 msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opcje aplikacji"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Wyświetl adresy departamentu"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Wyświetl adresy pasujące"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Ten 'dn' nie jest grupą aplikacji."
@@ -6012,6 +6460,40 @@ msgstr ""
 "Nie można przetłumaczyć nazwy wydania '%s', ustawiam nazwę na '%s'. "
 "Prawdopodobnie podstawa obiektów została zmieniona."
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Pokaż aplikacje"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplikacja"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nazwa aplikacji"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opcje aplikacji"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Wyświetl adresy departamentu"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Wyświetl adresy pasujące"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Ustawienia grupy"
@@ -6095,14 +6577,6 @@ msgstr "Utwórz nową grupę"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplikacja"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6216,6 +6690,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Szablon"
 
@@ -6374,7 +6849,9 @@ msgid "Application name"
 msgstr "Nazwa aplikacji"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Wyświetl nazwę"
 
@@ -6384,6 +6861,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr "Wyświetlana nazwa aplikacji (pod ikoną)"
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6403,7 +6881,9 @@ msgid "Choose subtree to place application in"
 msgstr "Wybierz poddrzewo do umieszczenia aplikacji"
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Ikona"
 
@@ -6417,22 +6897,27 @@ msgid "Reload picture from LDAP"
 msgstr "Przeładuj obrazek z LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Tylko wykonywalne dla członków"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Podmień konfigurację użytkownika na starcie"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Utwórz ikonę na desktopie członka"
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Utwórz wpis w menu startowym członka"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Utwórz wpis w pasku uruchamiania członka"
 
@@ -6472,6 +6957,7 @@ msgstr ""
 "Ta aplikacja ma wyłączone cechy opcji. Można je włączyć klikając poniżej."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Zmienna"
 
@@ -6575,6 +7061,20 @@ msgstr "Zapyisywanie aplikacji nieudane"
 msgid "Application settings"
 msgstr "Ustawienia Aplikacji"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nazwa aplikacji"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Zawartość zmiennych"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6639,6 +7139,7 @@ msgid "Descriptive text for department"
 msgstr "Tekst opisujący departament"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Kategoria"
 
@@ -6672,6 +7173,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Bazowy numer faxu tego poddrzewa"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Ustawienia administracyjne"
 
@@ -6680,10 +7182,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 "Próba przeniesienia drzewa nieudana. Docelowe drzewo jest poddrzewem w "
@@ -6738,72 +7240,86 @@ msgstr ""
 msgid "Department management"
 msgstr "Zarządzanie departamentem"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Usuwanie departamentu nieudane"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "Brak uprawnień do tworzenia departamentu w tym miejscu."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Istnieje już departament o takiej nazwie."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Wymagane pole 'Opis' nie jest wypełnione."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 "Pole 'Nazwa' zawiera zarezerwowane słow '%s'. Proszę wybrać inną nazwę."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 "Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
 "administracyjnej!"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Zapisywanie departamentu nieudane"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Zaznaczanie '%s'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Przenoszenie '%s' do '%s'"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Obiekt"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "BŁĄD kopiowania %s, anulowanie operacji"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Departamenty"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Telefon"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nazwa departamentu"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6819,20 +7335,6 @@ msgstr "Brak uprawnień do usunięcia tego departamentu."
 msgid ".."
 msgstr ".."
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Telefon"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Nazwa departamentu"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6883,6 +7385,7 @@ msgid "Enable DNS for this device"
 msgstr "Włącz DNS dla tego urządzenia."
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6895,6 +7398,8 @@ msgstr "Strefa"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr "TTL"
@@ -6961,11 +7466,14 @@ msgid "Terminal Service"
 msgstr "Usługa Terminali"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Tymczasowo zablokuj logowanie"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Ścieżka do fontów"
@@ -7133,8 +7641,11 @@ msgstr "Wybierz poddrzewo do umieszczenia terminala"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Tryb"
 
@@ -7146,7 +7657,9 @@ msgstr "Proszę wybrać tryb terminala"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Serwer Syslog"
 
@@ -7157,6 +7670,7 @@ msgid "Choose server to use for logging"
 msgstr "Proszę wybrać serwer do logowania"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Serwer NFS"
 
@@ -7165,6 +7679,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Proszę wybrać główny system plików NFS"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Serwer Swap"
 
@@ -7312,6 +7827,127 @@ msgstr "Proszę podać prawidłowy parametr HSync."
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Zapisywanie ustawień usługi terminala nieudane"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Usługi"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr "Usługa Terminali"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Rozmiar monitora"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "metoda"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Zdalny pulpit"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nowy sterownik"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Rozdzielczość"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Głębia kolorów"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Usługa Drukowania"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Serwer kolejkowania"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "włączone"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "włączone"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Wybierz model klawiatury"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Wybierz układ klawiatury"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Wybierz wariant klawiatury"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "Typ-Mime"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Punkt montowania"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Sprzęt telefoniczny"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7326,6 +7962,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Zapisywanie ustawień uruchamiania terminala nieudane"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Szablon terminala"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Serwer Ldap"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Uruchamiane jądro"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Sprawdź parametr"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Nazwa serwera"
@@ -7343,6 +8002,7 @@ msgid "Workstation template"
 msgstr "Szablon stacji roboczej"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Nazwa stacji roboczej"
 
@@ -7372,10 +8032,6 @@ msgstr "URL drukarki"
 msgid "Driver"
 msgstr "Sterownik"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Uprawnienia"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Użytkownicy którzy mogą używać tej drukarki"
@@ -7488,6 +8144,38 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Usługa Terminali"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Serwer Syslog"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Ustawienia użytkownika"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Akcja"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7555,6 +8243,17 @@ msgstr "Brak uprawnień do tworzenia serwera w tym elemencie."
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Nazwa serwera"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "do folferu"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Wyłącz usługę DHCP"
@@ -7605,15 +8304,34 @@ msgstr "Wymagane pole 'Nazwa stacji roboczej' jest puste."
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Zapisywanie usług stacji roboczej nieudane"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Systemy"
-
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "Nie można edytować tego typu obiektów (jeszcze)!"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Nazwa stacji roboczej"
 
-#: plugins/admin/systems/class_systemManagement.inc:236
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Stacja robocza"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Serwer NTP"
+
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Systemy"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "Nie można edytować tego typu obiektów (jeszcze)!"
+
+#: plugins/admin/systems/class_systemManagement.inc:236
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
 
@@ -7657,19 +8375,6 @@ msgstr "Szablon stacji roboczej dla"
 msgid "New System from incoming"
 msgstr "Nowy system dla nadchodzących"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Stacja robocza"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 msgid "Workstation is installing"
 msgstr "Stacja robocza jest instalowana"
@@ -7717,6 +8422,7 @@ msgid "Zones"
 msgstr "Strefy"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix mydomain"
 
@@ -7725,22 +8431,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix mydestination"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "Usługa POP3"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "Usługa POP3/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "Usługa IMAP"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "Usługa IMAP/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Usługa Sieve"
 
@@ -7757,6 +8468,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Skanowanie poczty (wirus/spam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Ustawienia Quota"
 
@@ -7769,6 +8481,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Zezwól na nieautoryzowane pobieranie informacji Free/Busy"
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "uprzywilejowane sieci SMTP"
 
@@ -7793,6 +8506,7 @@ msgid "Host used to relay mails"
 msgstr "Host użyty do przekazywania poczty"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Zezwalaj na pocztę z internetu"
 
@@ -7827,6 +8541,7 @@ msgid ""
 msgstr "Ten serwer nie posiada cech DNS. Można je włączyć klikając poniżej."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Strefa odwrotna"
 
@@ -7865,9 +8580,49 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 msgid "DNS service"
 msgstr "Usługa DNS"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nazwa strefy"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Podstawowy serwer DNS dla tej strefy"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Szeregowy"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Ponawia"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Wygasa"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Rekordy strefy"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Dostęp do Kerberos kadmin"
@@ -7879,6 +8634,7 @@ msgstr "Dziedzina Kerberos"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Użytkownik administracyjny"
 
@@ -7915,16 +8671,19 @@ msgstr "Dostęp administracyjny IMAP"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Identyfikator serwera"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Połączeniowy URL"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Port Sieve"
 
@@ -7945,6 +8704,7 @@ msgid "Glpi database"
 msgstr "Baza Glpi"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Baza"
@@ -7953,6 +8713,73 @@ msgstr "Baza"
 msgid "Machine name"
 msgstr "Nazwa maszyny"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr "Usługa FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr "Konfiguracja bazy FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Atrybut użytkownik jest pusty lub zawiera nieprawidłowe znaki."
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Atrybut hasło jest pusty lub zawiera nieprawidłowe znaki."
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr "Polecenie '%s' podane jako ACTION_HOOK dla dodatku '%s' nie istnieje."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Serwer Fax"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Usługa Sieve"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nazwa lokalizacji"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -8016,6 +8843,39 @@ msgstr "Usługa poczty Kolab"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Dodaj usługę Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Cel"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Usługa HTTP FreeBusy (przestarzała)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Host przekazujący"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Usługa HTTP FreeBusy (przestarzała)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8139,6 +8999,20 @@ msgstr ""
 msgid "Group"
 msgstr "Grupa"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Usługa drukowania"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Drukarka"
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8181,6 +9055,64 @@ msgstr "Pole adres IP zawiera nieprawidłowy adres."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Nowy komponent"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Urządzenia sieciowe"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Wybierz rodzaj komponentu systemu do utworzenia"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Linuksowe terminale i stacje robocze są automatycznie tworzone podczas "
+"uruchamiania. Z tego powodu można jedynie utworzyć szablon dla konkretnego "
+"drzewa. Serwery przeważnie są automatycznie dodawane, lecz w niektórych "
+"przypadkach trzeba utworzyć sztuczny wpis serwera aby zapewnić GOsa pewne "
+"informacje. Inne elementy sieciowe mogą zostać użyte w ustawieniach Nagios "
+"aby utworzyć zależności."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Szablon cienkiego klienta Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Sszablon stacji roboczej Linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Serwer Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Stacja robocza Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Drukarka sieciowa"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Inny element sieciowy"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Utwórz"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 msgid "Time server"
 msgstr "Serwer czasu"
@@ -8190,6 +9122,7 @@ msgid "Printer type"
 msgstr "Typ drukarki"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8203,6 +9136,7 @@ msgstr "Typ drukarki"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr "Producent"
@@ -8211,10 +9145,6 @@ msgstr "Producent"
 msgid "Supported interfaces"
 msgstr "Wspierane interfejsy"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Szeregowy"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr "Równoległy"
@@ -8228,11 +9158,15 @@ msgid "Contacts"
 msgstr "Kontakty"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr "Osoba techniczna"
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Osoba kontaktowa"
 
@@ -8244,54 +9178,6 @@ msgstr "Załączniki"
 msgid "Installed cartridges"
 msgstr "Zainstalowane kartridźe"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Wybierz rodzaj komponentu systemu do utworzenia"
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Linuksowe terminale i stacje robocze są automatycznie tworzone podczas "
-"uruchamiania. Z tego powodu można jedynie utworzyć szablon dla konkretnego "
-"drzewa. Serwery przeważnie są automatycznie dodawane, lecz w niektórych "
-"przypadkach trzeba utworzyć sztuczny wpis serwera aby zapewnić GOsa pewne "
-"informacje. Inne elementy sieciowe mogą zostać użyte w ustawieniach Nagios "
-"aby utworzyć zależności."
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Szablon cienkiego klienta Linux"
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Sszablon stacji roboczej Linux"
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Serwer Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Stacja robocza Windows"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Drukarka sieciowa"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Inny element sieciowy"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Utwórz"
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Edytuj udział"
@@ -8301,6 +9187,7 @@ msgid "NFS setup"
 msgstr "Ustawienia NFS"
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Volume"
 msgstr "Głośność"
 
@@ -8313,6 +9200,7 @@ msgid "Codepage"
 msgstr "Strona kodowa"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Option"
 msgstr "Opcja"
 
@@ -8322,10 +9210,12 @@ msgid "System type"
 msgstr "Typ systemu"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "System operacyjny"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8421,10 +9311,39 @@ msgstr "Brak uprawnień do tworzenia telefonu w tym elemencie."
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Numer telefonu"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Sprzęt telefoniczny"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "Tryb DTMF"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Domyślny IP"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 "Plik '/etc/gosa/encodings' nie istnieje. Nie można pobrać wspieranych "
 "zestawów znaków."
 
@@ -8460,6 +9379,20 @@ msgstr "Ścieżka zawiera nieprawidłowe znaki."
 msgid "Option contains invalid characters."
 msgstr "Opcja zawiera nieprawidłowe znaki."
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Usługa DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8524,6 +9457,35 @@ msgstr ""
 "Podana wartość parametru  REPOSITORY_HOOK '%s' w gosa.conf zwraca pusty ciąg "
 "znaków."
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Status systemu"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Sprawdź parametr"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "Klasy FAI"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Obecne wydanie"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Zaawansowane ustawienia telefonu"
@@ -8546,10 +9508,6 @@ msgstr "Proszę wybrać typ telefonu"
 msgid "refresh"
 msgstr "Odśwież"
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "Tryb DTMF"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8687,6 +9645,7 @@ msgstr "Wgrany plik ppd jest pusty, nie można utworzyć nowego pliku ppd."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Sekcja"
 
@@ -8713,6 +9672,7 @@ msgstr "Sterownik drulkarki"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Model"
 
@@ -8760,6 +9720,11 @@ msgstr "Wybór ppd drukarki."
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Zapisywanie usług stacji roboczej nieudane"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Stacje robocze"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8810,13 +9775,6 @@ msgstr "Port"
 msgid "Choose mouse port"
 msgstr "Wybierz port myszy"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Sprzęt telefoniczny"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -8886,11 +9844,6 @@ msgstr "Dostarcza usługi skanowania"
 msgid "Boot parameters"
 msgstr "Parametry uruchamiania"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Uruchamiane jądro"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -8919,7 +9872,9 @@ msgstr "Serwer FAI"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Wersja"
@@ -8976,10 +9931,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "użyj trybu debug podczas uruchamiania"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Zdalny pulpit"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Metoda połączenia"
@@ -9016,10 +9967,6 @@ msgstr "Wybierz aby rozpocząć usługę drukowania IPP na terminalu"
 msgid "Provide print services"
 msgstr "Dostarcza usługi drukowania"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Serwer kolejkowania"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr "Proszę wybrać system plików NFS dla przechowywania plików kolejki"
@@ -9029,11 +9976,13 @@ msgid "Select scanner driver to use"
 msgstr "Proszę wybrać sterownik skanera do użycia"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repozytorium"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Nadrzędny serwer"
 
@@ -9060,6 +10009,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 msgid "Repository service"
 msgstr "Usługa repozytorium"
 
@@ -9091,6 +10041,15 @@ msgstr "Ta nazwa jest już w użyciu."
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Wersja"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Lista skonfigurowanych repozytoriów"
@@ -9104,6 +10063,50 @@ msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 "To menu umożliwia tworzenie, usuwanie oraz edycję ustawień repozytorium."
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr "Baza inwentarza"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr "Zarządzanie Glpi"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Podany atrybut bazy danych jest pusty lub zawiera nieprawidłowe znaki."
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Serwer pocztowy"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Usługa Sieve"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+msgid "Admin"
+msgstr "Admin"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "Zarządzaj typami systemów"
@@ -9252,6 +10255,105 @@ msgstr "B/D"
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr "Nie można usunąć konta glpi, brak obsługi mysql w php."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Usuń rozszerzenie drukarki"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Załącznik"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Załącznik"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Załącznik"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Załącznik"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Nowy monitor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Nazwa urządzenia"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Dodaj/Edytuj płytę główną"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Nowa karta dźwiękowa"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Nowy procesor"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Nowe inne urządzenie"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Nazwa urządzenia"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Nowy dysk twardy"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Nazwa urządzenia"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Nowy kontroler"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+#, fuzzy
+msgid "Device graphics card"
+msgstr "Nowa karta graficzna"
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+#, fuzzy
+msgid "Device power supply"
+msgstr "Nowy zasilacz"
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Urządzenie wyświetlające"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Zarządzaj producentami"
@@ -9288,6 +10390,7 @@ msgstr "Dodaj/Edytuj monitor"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Komentarze"
@@ -9419,6 +10522,7 @@ msgid "Add/Edit network interface"
 msgstr "Dodaj/Zmień interfejs sieciowy"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "Adres MAC"
 
@@ -9754,6 +10858,31 @@ msgstr "Nie można usunąć typu drukarki, jest wciąż w użyciu przez '%s'."
 msgid "since"
 msgstr "od"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Dodaj rozszerzenie drukarki"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Wspierane interfejsy"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Wspierane interfejsy"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Wspierane interfejsy"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Kartridźe"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9829,6 +10958,21 @@ msgstr "Tylko małe litery są dozwolone, proszę sprawdzić '%s'."
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Zapisywanie konta pocztowego nieudane"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Ustawienia Samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Rekordy DNS"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "adres IP"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr "Nie można usunąć tego elementu, ponieważ jest wciąż w użyciu."
@@ -9866,18 +11010,10 @@ msgstr "Wyrażenie regularne dla dopasowania kartridźy"
 msgid "Reference"
 msgstr "Referencja"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nazwa strefy"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Adres sieciowy"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Rekordy strefy"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr "Nie można edytować ponieważ strefa nie została zapisana."
@@ -9894,16 +11030,6 @@ msgstr "Podstawowy serwer DNS dla tej strefy"
 msgid "Serial number (automatically incremented)"
 msgstr "Numer seryjny (atumatycznie zwiększany)"
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Ponawia"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Wygasa"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "Rekordy MX"
@@ -9946,7 +11072,7 @@ msgstr "Proszę wybrać grupę obiektów"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 msgid "Down"
 msgstr "W dół"
 
@@ -10294,62 +11420,54 @@ msgstr "Usługa dla dodania"
 msgid "All available services are already in use."
 msgstr "Wszystkie dostępne usługi są już w użyciu."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
-msgstr "Usługa FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
-msgstr "Konfiguracja bazy FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "Zapisywanie usługi serwera nieudane"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Zapisywanie usługi serwera nieudane"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Atrybut użytkownik jest pusty lub zawiera nieprawidłowe znaki."
+#: plugins/admin/systems/class_goCupsServer.inc:206
+#, fuzzy
+msgid "Cups"
+msgstr "góra"
 
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Usługa Cyrus"
+
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
+msgstr "Usługa LDAP"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:79
 #, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Atrybut hasło jest pusty lub zawiera nieprawidłowe znaki."
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
 #, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr "Polecenie '%s' podane jako ACTION_HOOK dla dodatku '%s' nie istnieje."
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
-msgid "LDAP service"
-msgstr "Usługa LDAP"
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr "Serwer terminali musi posiadać zdefiniowaną ścieżkę fontów."
 
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
@@ -10428,32 +11546,94 @@ msgstr "Edytuj usługę"
 msgid "Remove service"
 msgstr "Usuń usługę"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
-msgid "Inventory database"
-msgstr "Baza inwentarza"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
-msgid "Glpi management"
-msgstr "Zarządzanie Glpi"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
+msgstr "Start"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
+msgstr "Restart"
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr "Nie można ustawić statusu podczas gdy nie zapisano tego serwera."
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr "Podana metoda '%s' nie może zostać uruchmiona dla usług."
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr "Usługa czasu"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
+msgstr "Usługa NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "Zapisywanie usługi serwera nieudane"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "Zapisywanie usługi serwera nieudane"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
-msgid "The attribute database is empty or contains invalid characters."
-msgstr "Podany atrybut bazy danych jest pusty lub zawiera nieprawidłowe znaki."
+#: plugins/admin/systems/class_goNtpServer.inc:219
+#, fuzzy
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Zatrzymaj usługę"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Zapisywanie usługi serwera nieudane"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr "podana baza jest pusta lub zawiera nieprawidłowe znaki."
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Serwer Ldap"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Serwer Ldap"
 
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
@@ -10472,6 +11652,7 @@ msgid "This value specifies the maximal header size."
 msgstr "Ta wartość określa maksymalny rozmiar nagłówków."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr "Max rozmiar skrzynki"
 
@@ -10480,6 +11661,7 @@ msgid "Defines the maximal size of mail box."
 msgstr "Określa maksymalny rozmiar skrzynki."
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 msgid "Max message size"
 msgstr "Max rozmiar wiadomości"
 
@@ -10488,6 +11670,7 @@ msgid "Specify the maximal size of a message."
 msgstr "Podaj maksymalny rozmiar wiadomości."
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 msgid "Relay host"
 msgstr "Host przekazujący"
 
@@ -10496,6 +11679,7 @@ msgid "Relay messages to following host:"
 msgstr "Przekazuj wiadomości do następujących hostów:"
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr "Sieci lokalne"
 
@@ -10508,6 +11692,7 @@ msgid "Domains and routing"
 msgstr "Domeny i routing"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr "Domeny dla których akceptować pocztę"
 
@@ -10528,6 +11713,7 @@ msgid "Restrictions"
 msgstr "Ograniczenia"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr "Ograniczenia dla nadawcy"
 
@@ -10537,6 +11723,7 @@ msgid "Restriction filter"
 msgstr "Filtr ograniczeń"
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr "Ograniczenia dla odbiorcy"
 
@@ -10560,131 +11747,32 @@ msgstr "Ustaw nowy status"
 msgid "Set status"
 msgstr "Ustaw status"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr "Zatrzymaj"
-
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
-msgstr "Start"
-
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
-msgstr "Restart"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr "Nie można ustawić statusu podczas gdy nie zapisano tego serwera."
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr "Podana metoda '%s' nie może zostać uruchmiona dla usług."
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Usługa Terminali"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr "Serwer terminali musi posiadać zdefiniowaną ścieżkę fontów."
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 msgid "Start IMAP service"
 msgstr "Uruchom usługę IMAP"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 msgid "Start IMAP SSL service"
 msgstr "Uruchom usługę IMAP SSL"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 msgid "Start POP3 service"
 msgstr "Uruchom usługę POP3"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 msgid "Start POP3 SSL service"
 msgstr "Uruchom usługę POP3 SSL"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
-msgstr "Usługa czasu"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-msgid "NTP service"
-msgstr "Usługa NTP"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Zapisywanie usługi serwera nieudane"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-msgid "The given base is empty or contains invalid characters."
-msgstr "podana baza jest pusta lub zawiera nieprawidłowe znaki."
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 msgid "Logging service"
 msgstr "Usługa Logowania"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 msgid "Syslog service"
 msgstr "Usługa Syslog"
 
@@ -10703,10 +11791,10 @@ msgstr "Zapisywanie usługi serwera nieudane"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "enabled"
-msgstr "włączone"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+#, fuzzy
+msgid "Syslog"
+msgstr "Logi systemowe"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 msgid "VoIP service"
@@ -10744,6 +11832,26 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Atrybut krajowego prefiksu jest pusty lub zawiera nieprawidłowe znaki."
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Serwer fontów"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Usługa Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Rekord SOA"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Kod konta"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10759,11 +11867,23 @@ msgstr "Zapisywanie usługi serwera nieudane"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
-msgid "GLPI database information"
-msgstr "informacje bazy danych GLPI"
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+#, fuzzy
+msgid "Log"
+msgstr "Login"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Usługa Logowania"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
+msgstr "włączone"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 msgid "Kerberos service"
 msgstr "Usługa Kerberos"
 
@@ -10801,9 +11921,10 @@ msgstr "Podany administrator kerberos jest pusty."
 msgid "The specified kerberos realm is empty."
 msgstr "Podana dziedzina kerberos jest pusta."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Informacje bazy FAX"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+#, fuzzy
+msgid "Realm"
+msgstr "Pamięć"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 msgid "Mail service (SMTP)"
@@ -10840,6 +11961,24 @@ msgstr "Proszę podać liczbę jako wartość limitu skrzynki pocztowej."
 msgid "Please specify a numeric value for message size limit."
 msgstr "Proszę podać liczbę jako wartość limitu rozmiaru wiadomosci."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Serwer pocztowy"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Transporty"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr "informacje bazy danych GLPI"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr "Usługa IMAP/POP3"
@@ -10892,9 +12031,24 @@ msgstr "Parametr URI połączenia imap musi byc w formacie '%s'."
 msgid "The sieve port needs to be numeric."
 msgstr "Port sieve musi być liczbą."
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
-msgid "Logging database information"
-msgstr "Informacje bazy logowania"
+#: plugins/admin/systems/class_goImapServer.inc:273
+#, fuzzy
+msgid "Imap"
+msgstr "Import"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Serwer imap"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Hasło Administratora"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Informacje bazy FAX"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 msgid "File service"
@@ -10930,6 +12084,20 @@ msgstr "Usuwanie kontenera montowania nieudane"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Zapisywanie kontenera montowania nieudane"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Uruchom usługę"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nowy wpis"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr "Informacje bazy logowania"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -10954,6 +12122,7 @@ msgid "Phone queue"
 msgstr "Kolejka telefoniczna"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "System"
 
@@ -10970,6 +12139,11 @@ msgstr "Musi być wybrany co najmniej jeden serwer NTP."
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "Usuwanie ustawień poczty grupy nieudane"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Status systemu"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Wybierz aby zobaczyć departamenty"
@@ -11027,6 +12201,7 @@ msgid "Display objects of department"
 msgstr "Wyświetl obiekty departamentu"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Grupy obiektów"
@@ -11111,6 +12286,16 @@ msgstr "Zapisywanie grupy obiektów nieudane"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Usuwanie grupy obiektów nieudane"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Grupa obiektu"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Członkowie"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11135,6 +12320,7 @@ msgid "Generic queue Settings"
 msgstr "Ogólne ustawienia kolejki"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Timeout"
 
@@ -11163,6 +12349,7 @@ msgid "Use music on hold instead of ringing"
 msgstr "Użyj muzyki zamiast dzwonienia podczas oczenikwania"
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr "Muzyka podczas oczekiwania"
 
@@ -11211,26 +12398,32 @@ msgid "Phone attributes "
 msgstr "Atrybuty telefonu"
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr "Ogłaszaj czas podtrzymania"
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr "Zezwól dodzwanianemu użytkownikowi na przekazanie tej rozmowy"
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr "Zezwala dzwoniącemu użytkownikowi na przekazanie rozmowy"
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr "Zezwól dodzanianemu użytkownikowi na rozłączenie przez wciśnięcie *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr "Zezwala dzwoniącemu na rozłączenie poprzez wciśnięcie *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr "Dzwoń zamiast odtwarzać muzyki w tle"
 
@@ -11264,6 +12457,11 @@ msgstr "Zapisywanie grupy obiektów nieudane"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Usuwanie grupy obiektów nieudane"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Grupa podstawowa"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "dzwoń do wszystkich"
@@ -11400,6 +12598,75 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "Usuwanie ustawień poczty grupy nieudane"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Członkowie są w grupie odbioru telefonu"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Maksymalna długość kolejki"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Częstotliwość zapowiedzi"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Witaj %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+#, fuzzy
+msgid "Report hold time"
+msgstr "Ogłaszaj czas podtrzymania"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+#, fuzzy
+msgid "'There are' sound"
+msgstr "'Istnieją ...'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+#, fuzzy
+msgid "'Call waiting' sound"
+msgstr "'... rozmów oczekujących'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "Wiadomość 'dziękujemy'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "plik dźwiękowy 'minut'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Second' sound"
+msgstr "plik dźwiękowy 'sekund'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Plik dźwiękowy 'mniej niż'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Numer telefonu"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Komunikat zapowiadający"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11591,12 +12858,50 @@ msgstr "Fully Automatic Installation"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Tworzenie bazy skryptów FAI nieudane"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Importuj skrypt"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Ścieżka do skryptu"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Zapisywanie bazy szablonów FAI nieudane"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nowy szablon"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Zestaw szablonów"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Nazwa Szablonu"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Nazwa pliku"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Uprawnienia"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11633,6 +12938,16 @@ msgstr "Podana nazwa gałęzi jest niepoprawna."
 msgid "Specified freeze name is invalid."
 msgstr "Podana nazwa zamrożenia jest niepoprawna."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Zarządzanie"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Zarządzanie Glpi"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Metoda instalacji"
@@ -11766,71 +13081,107 @@ msgstr "Plik pakietu '%s' nie istnieje."
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Zapisywanie bazy pakietów nieudane"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Pakiet"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Lista pakietów"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Metoda instalacji"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr "Ta lista wyświetla wszystkie przypisane nazwy klas dla tego profilu."
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr "Zestaw zaczepów"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Zestaw szablonów"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Zestaw skryptów"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Zestaw zmiennych"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr "Zestaw pakietów"
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Tablica partycji"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr "Usuń klasę z profilu"
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr "Proszę przypisać przynajmniej jedną klasę do tego profilu."
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Proszę podać prawidłową nazwę."
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr "Już istnieje profil ze zdefiniowaną tą nazwą klasy."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Zapisywanie profilu FAI nieudane"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+msgid "Profile"
+msgstr "Profile"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Nowy profil"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Zapisywanie bazy zaczepu FAI nieudane"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "Klasy FAI"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "Zaczepy"
+
+#: plugins/admin/fai/class_faiHook.inc:475
+#, fuzzy
+msgid "FAI hook"
+msgstr "Wyświetl zaczepy FAI"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Zadanie"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -11847,6 +13198,7 @@ msgid "FS type"
 msgstr "Typ FS"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Punkt montowania"
@@ -11857,6 +13209,7 @@ msgid "Size in MB"
 msgstr "Rozmiar w MB"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Opcje montowania"
@@ -11944,6 +13297,7 @@ msgid "Variable attributes"
 msgstr "Atrybuty zmiennych"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Zawartość zmiennych"
 
@@ -11980,6 +13334,41 @@ msgstr "partycje %s"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Zapisywanie bazy tablicy partycji FAI nieudane"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nowa tablica partycji"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Tablica partycji"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Partycje"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Typ systemu"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Partycje"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "pokaż informacje o systemie"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Partycje"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Proszę podać wartość dla skryptu."
@@ -11997,10 +13386,6 @@ msgstr "Nazwa klasy"
 msgid "Hook attributes"
 msgstr "Atrybuty zaczepu"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Zadanie"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr "Proszę wybrać istniejące zadanie FAI"
@@ -12086,6 +13471,11 @@ msgstr "Nowa nazwa klasy"
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Zapisywanie bazy zmiennych FAI nieudane"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Wyświetl zmienne FAI"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "Nie wgrano jeszcze żadnego pliku"
@@ -12132,6 +13522,7 @@ msgid "Destination path"
 msgstr "Ścieżka docelowa"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr "Właściciel"
@@ -12200,10 +13591,6 @@ msgstr ""
 "To menu umożliwia wybieranie wielu pakietów i dodawanie ich do obecnie "
 "edytowanej listy pakietów."
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Pakiet"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12483,6 +13870,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Proszę podać nazwę konferencji."
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Grupa podstawowa"
@@ -12506,6 +13894,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtry"
@@ -12587,11 +13976,27 @@ msgstr "Już istnieje aplikacja o takiej 'Nazwie'"
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "Brak uprawnień do tworzenia telefonu w tym elemencie."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Typ-Mime"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "Typ-Mime"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Utwórz aplikację"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Użyte aplikacje"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -12806,6 +14211,37 @@ msgstr "Usunięto użytkownika '%s' z kolejki telefonicznej '%s'."
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Usuwanie konta telefonicznego nieudane"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Ustawienia telefonu"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Metody dostarczania"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Telefon"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+#, fuzzy
+msgid "Voivemail pin"
+msgstr "PIN poczty głosowej"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Numer telefonu"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Ustawienia pocztowe"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -12956,6 +14392,20 @@ msgstr "Proszę wybrać poprawną bazę"
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Zapisywanie konta oxchange nieudane"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Zarządzanie Asterisk"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Tekst makro"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr "Argument"
@@ -13076,6 +14526,7 @@ msgid "Lifetime (in days)"
 msgstr "Wiek (w dniach)"
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr "Prekonfiturowany PIN"
 
@@ -13085,6 +14536,7 @@ msgid "PIN"
 msgstr "PIN"
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr "Nagrywanie konferencji"
 
@@ -13093,6 +14545,7 @@ msgid "Sound file format"
 msgstr "Format pliku dźwiękowego"
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr "Odtwarzaj muzykę podczas zawieszenia"
 
@@ -13109,13 +14562,10 @@ msgid "Count users"
 msgstr "Zlicz użytkowników"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr "Konferencje telefoniczne"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Zarządzanie"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13157,6 +14607,50 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Zarządzanie konferencją"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Konferencja"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Aktywuj menu sesji"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#, fuzzy
+msgid "Announce user activity"
+msgstr "Częstotliwość zapowiedzi"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Zlicz użytkowników"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Nazwa konferencji"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "format"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#, fuzzy
+msgid "Lifetime"
+msgstr "Wiek (w dniach)"
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "Zarządzanie konferencją"
@@ -13198,6 +14692,9 @@ msgid "Duration"
 msgstr "Czas trwania"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Raporty telefoniczne"
 
@@ -13587,62 +15084,62 @@ msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
 msgid "References"
 msgstr "Zależności"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s' podane jako CHECK dla dodatku '%s' nie istnieje."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s' podane jako POSTCREATE dla dodatku '%s' nie istnieje."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s' podane jako POSTREMOVE dla dodatku '%s' nie istnieje."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Obiekt '%s' jest już zaznaczony"
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, fuzzy, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr "Znakowanie obiektu nieudane"
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Usuwanie znacznika z obiektu '%s'"
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Zapisywanie grupy obiektów nieudane"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "Brak uprawnień do usunięcia tego elementu!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -13651,7 +15148,7 @@ msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
 "skonfigurowana w gosa.conf."
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
@@ -13660,17 +15157,17 @@ msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna(e) '%s' nie "
 "jest skonfigurowana w gosa.conf."
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Odtwarzanie snapshot'u nieudane."
@@ -13679,7 +15176,7 @@ msgstr "Odtwarzanie snapshot'u nieudane."
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr "Nie można użyć ssha do szyfrowania. (Brak fukcji mhash / sha1)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -13687,12 +15184,12 @@ msgstr ""
 "Informacje w gosa.conf częściowo uległy zmianie. Proszę je skonwertować "
 "używając dostępnego skryptu fix_config.sh"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -13765,7 +15262,7 @@ msgstr "Parsowanie pliku PPD %s nieudane - nie znaleziono informacji."
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Błąd XML w pliku gosa.conf: %s w linii %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Nie można połączyć się z LDAP. Proszę skontaktować się z administratorem."
@@ -14304,7 +15801,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Nie można zalogować się do serwera LDAP. Powód: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14423,120 +15920,120 @@ msgstr ""
 msgid "Access control"
 msgstr "Opcje dostępu"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Poziom logu"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Utwórz nowy obiekt FAI"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Ignoruj poddrzewa"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Edytuj"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Usuń"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Edytuj klasę"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Utwórz nowy obiekt FAI"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Dodaj członka"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Dodaj członka"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Dodaj członka"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Dodaj członka"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Nieznany FAIstate %s"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Członkowie"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Zapisywanie informacji ACL nieudane"
@@ -14640,25 +16137,25 @@ msgstr "Nie można otworzyć pliku '%s', prawdopodobnie plik nie istnieje."
 msgid "Can't read file '%s', check permissions."
 msgstr "Nie można czytać pliku '%s', proszę sprawdzić uprawnienia."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "Sesja nie będzie szyfrowana."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Sprowadź sesję SSL"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
@@ -14666,30 +16163,30 @@ msgstr ""
 "GOsa nie może uzyskać informacji o zainstalowanych plikach schema. Proszę "
 "skorygować."
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Ustawienia serwera LDAP zawierają stare definicje schema. Proszę uruchomić "
 "setup."
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15007,10 +16504,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN Administratora"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Hasło Administratora"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15317,8 +16810,35 @@ msgid "Reason for generating this snapshot"
 msgstr "Odtwarzanie snapshot'y obiektu"
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Rozmiar Quoty"
+#~ msgid "Day"
+#~ msgstr "dzień"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Wybierz model klawiatury"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Wybierz wariant klawiatury"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Głośność"
+
+#, fuzzy
+#~ msgid "Technical responsilbe"
+#~ msgstr "Osoba techniczna"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Identyfikator serwera"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia konta w tym 'Kontenerze'."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Standardowy certyfikat"
 
 #, fuzzy
 #~ msgid "Vocation message"
@@ -15544,9 +17064,6 @@ msgstr "Odtwarzanie snapshot'y obiektu"
 #~ "below."
 #~ msgstr "Ten serwer posiada cechy kolab. Można je wyłączyć klikając poniżej"
 
-#~ msgid "Add Kolab service"
-#~ msgstr "Dodaj usługę Kolab"
-
 #~ msgid ""
 #~ "This server has kolab features disabled. You can enable them by clicking "
 #~ "below."
@@ -15624,9 +17141,6 @@ msgstr "Odtwarzanie snapshot'y obiektu"
 #~ msgid "New Entry"
 #~ msgstr "Nowy wpis"
 
-#~ msgid "Admin"
-#~ msgstr "Admin"
-
 #~ msgid "Admin Toggle"
 #~ msgstr "Przełącznik admina"
 
@@ -15637,9 +17151,6 @@ msgstr "Odtwarzanie snapshot'y obiektu"
 #~ "To konto ma wyłączone rozszerzenia %s. Rozszerzenia Posix są wymagane dla "
 #~ "kont openXchange, należy je wcześniej włączyć."
 
-#~ msgid "OpenXchange"
-#~ msgstr "OpenXchange"
-
 #~ msgid ""
 #~ "This account has %s features disabled. Mail features are needed for "
 #~ "openXchange accounts, enable them first."
@@ -15741,9 +17252,3 @@ msgstr "Odtwarzanie snapshot'y obiektu"
 
 #~ msgid "Thin Clients"
 #~ msgstr "Stacje bezdyskowe"
-
-#~ msgid "Workstations"
-#~ msgstr "Stacje robocze"
-
-#~ msgid "Profile"
-#~ msgstr "Profile"

diff --git a/locale/ru/LC_MESSAGES/messages.mo b/locale/ru/LC_MESSAGES/messages.mo
index 4982ea5182b4d2e01df1af5da00ad35613ff9efd..5fb10b98b7860f6215fc900c32d58dec55a70367 100644 (file)
Binary files a/locale/ru/LC_MESSAGES/messages.mo and b/locale/ru/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 17556dfe50ed1714eb9939839f1e42cbc96f869a..abeb064b5fa51e3cb90dd1a16053dffb74699274 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -1,13 +1,15 @@
 # Translation of messages.po to Russian
 # Valia V. Vaneeva <fattie@altlinux.ru>, 2004.
 # $Id: messages.po,v 1.61 2005/04/18 10:37:13 migor-guest Exp $
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:112 include/class_plugin.inc:113
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-18 15:46+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -16,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1312
 msgid "My account"
 msgstr "Моя учетная запись"
 
@@ -25,6 +27,7 @@ msgid "Administration"
 msgstr "Администрирование"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Дополнительно"
 
@@ -36,18 +39,29 @@ msgstr "Дополнительно"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1307
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -57,7 +71,9 @@ msgstr "Дополнительно"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Общее"
@@ -68,6 +84,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1252
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -75,16 +92,21 @@ msgstr "Окружение"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:982
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Почта"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -99,23 +121,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:172
 msgid "Connectivity"
 msgstr "Подключение"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Факс"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -127,16 +154,19 @@ msgstr "Факс"
 #: plugins/admin/systems/class_systemManagement.inc:764
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Телефон"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
@@ -161,6 +191,8 @@ msgid "Parameter"
 msgstr "Параметры загрузки"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Запуск"
@@ -172,8 +204,9 @@ msgstr "Устройства"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -246,6 +279,7 @@ msgstr "Назначение"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #, fuzzy
@@ -277,7 +311,7 @@ msgstr "Путь к профилю"
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 #, fuzzy
 msgid "Packages"
 msgstr "Показать телефоны"
@@ -394,7 +428,7 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:223
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:182
@@ -440,12 +474,12 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -501,9 +535,9 @@ msgstr "Добавить"
 #: plugins/admin/systems/class_systemManagement.inc:484
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -527,8 +561,8 @@ msgstr "Добавить"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -539,8 +573,8 @@ msgstr "Добавить"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -574,6 +608,7 @@ msgstr "Основной адрес"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_servGeneric.inc:321
 #: plugins/admin/systems/class_systemManagement.inc:765
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
@@ -597,8 +632,9 @@ msgid "not defined"
 msgstr "не определена"
 
 #: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/class_mailAccount.inc:994
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Размер квоты"
 
@@ -718,14 +754,14 @@ msgstr "Отклонять сообщения размером больше"
 
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Мб"
 
 #: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:1007
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
@@ -756,7 +792,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
 #: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/class_mailAccount.inc:1001
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
@@ -776,7 +812,7 @@ msgstr "отключает все почтовые настройки!"
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -824,7 +860,7 @@ msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:983
 #: plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -880,27 +916,27 @@ msgstr "Что-то будет"
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "Метод '%s' не описан в вашем файле конфигурации."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
+#: plugins/personal/mail/class_mailAccount.inc:151
 #: plugins/admin/groups/class_groupMail.inc:173
 #, fuzzy, php-format
 msgid "Can't get quota information for '%s'."
 msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -909,13 +945,13 @@ msgstr ""
 "В этой учетной записи есть настройки электронной почты. Вы можете удалить "
 "их, щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -924,21 +960,21 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:312
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:318
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Добавление своего единственного адреса к списку пересылки не имеет смысла."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/personal/mail/class_mailAccount.inc:361
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -947,131 +983,136 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку "
 "альтернативных адресов."
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:371
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:624
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:728
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:781
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:795
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "Введенный вами адрес уже используется."
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:801
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:810
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:820
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:969
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:971
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:995
 #, fuzzy
 msgid "Mail max size"
 msgstr "Размер квоты"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1008
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Основной адрес"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:997
 #, fuzzy
 msgid "Local delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:998
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
+#: plugins/personal/mail/class_mailAccount.inc:999
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1000
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Информация об организации"
 
-#: plugins/personal/mail/class_mailAccount.inc:994
+#: plugins/personal/mail/class_mailAccount.inc:1002
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
 msgid "Spam level"
 msgstr "Уровень информативности"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Размер квоты"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1005
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Альтернативные адреса"
@@ -1160,10 +1201,15 @@ msgstr "Назад"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1221,8 +1267,8 @@ msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1232
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
 #: plugins/personal/samba/class_sambaAccount.inc:643
@@ -1230,16 +1276,17 @@ msgid "Home directory"
 msgstr "Домашний каталог"
 
 #: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/class_posixAccount.inc:1235
 msgid "Shell"
 msgstr "Оболочка"
 
 #: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/class_posixAccount.inc:1233
 msgid "Primary group"
 msgstr "Основная группа"
 
 #: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:205
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1259,6 +1306,7 @@ msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
@@ -1278,7 +1326,7 @@ msgid "Account"
 msgstr "Учетная запись"
 
 #: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/class_posixAccount.inc:1243
 msgid "System trust"
 msgstr "Системные доверия"
 
@@ -1672,54 +1720,54 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1220
 #, fuzzy
 msgid "POSIX account"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1230
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1231
 #, fuzzy
 msgid "Group ID"
 msgstr "Группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1236
 #, fuzzy
 msgid "Shadow min"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1237
 #, fuzzy
 msgid "Shadow max"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1238
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1239
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
+#: plugins/personal/posix/class_posixAccount.inc:1240
 #, fuzzy
 msgid "Shadow last change"
 msgstr "Показать телефоны"
 
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1242
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Показать людей"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1244
 #, fuzzy
 msgid "System trust model"
 msgstr "Системные доверия"
@@ -1752,7 +1800,7 @@ msgid "Allow user to change password from client"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/class_sambaAccount.inc:1050
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
@@ -1761,7 +1809,7 @@ msgid "Temporary disable samba account"
 msgstr "Временно отключить учетную запись Samba"
 
 #: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1062
 msgid "Domain"
 msgstr "Домен"
 
@@ -1770,12 +1818,12 @@ msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
 #: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1048
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
 #: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1049
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
@@ -1840,18 +1888,18 @@ msgid "Reconnect if disconnected"
 msgstr "В"
 
 #: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1051
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
 #: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/class_sambaAccount.inc:1053
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1054
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1864,7 +1912,7 @@ msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1039
 msgid "Samba settings"
 msgstr "Настройки Samba"
 
@@ -1990,41 +2038,41 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Моя учетная запись"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1055
 #, fuzzy
 msgid "Account expires"
 msgstr "Учетная запись"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1056
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1057
 #, fuzzy
 msgid "Password expires"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1058
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Домашний каталог"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1059
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1060
 #, fuzzy
 msgid "Generic script path"
 msgstr "Путь к сценариям"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1061
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1063
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Разрешить подключения только от этой рабочей станции"
@@ -2069,59 +2117,55 @@ msgstr ""
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:548
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Удалить учетную запись POSIX"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:837
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Аккаунт Proxy"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:884
 msgid "Kerberos database communication failed"
 msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:901
 msgid "Can't remove user from kerberos database."
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:912
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:958
 #, fuzzy
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 #: plugins/addons/addressbook/class_addressbook.inc:546
 #: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:973
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:979
 #: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:982
 msgid "The required field 'Login' is not set."
 msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:989
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2129,7 +2173,7 @@ msgstr ""
 "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
 "существует."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:996
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2137,110 +2181,110 @@ msgstr ""
 "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
 "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:999
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1002
+#: plugins/personal/generic/class_user.inc:1027
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/personal/generic/class_user.inc:1024
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1013
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1016
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1146
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1293
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1295
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1296
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Роль"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
@@ -2251,70 +2295,112 @@ msgstr "Почтовый индекс"
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:163 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/generic.tpl:141
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Ветка"
+
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "User password"
 msgstr "Новый пароль"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:236
 #, fuzzy
 msgid "Surename"
 msgstr "Имя сервера"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1320
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Имя"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1321
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/generic.tpl:71
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/generic.tpl:81
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Организация"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2327,112 +2413,119 @@ msgstr "Организация"
 msgid "Department"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1329
+#: plugins/personal/generic/generic.tpl:91
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1330
 #, fuzzy
 msgid "Gender"
 msgstr "Отправитель"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1331
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1332
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1333
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:783
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Адм. единица"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/paste_generic.tpl:22
+#, fuzzy
+msgid "User picture"
+msgstr "Изображение"
+
+#: plugins/personal/generic/class_user.inc:1338
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1339
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1340
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1342
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1344 html/getxls.php:174
 #: html/getxls.php:236
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Стандартный сертификат"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:36
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:27
+#: plugins/personal/generic/generic.tpl:38
 msgid "Change picture"
 msgstr "Сменить изображение"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:47
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
@@ -2440,12 +2533,12 @@ msgstr "Сменить изображение"
 msgid "Last name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:52
 #, fuzzy
 msgid "Template name"
 msgstr "Шаблон"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
@@ -2453,67 +2546,33 @@ msgstr "Шаблон"
 msgid "First name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:63
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:109
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Установить"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:116 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:128
 #, fuzzy
 msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Ветка"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:146
 msgid "Choose subtree to place user in"
 msgstr "Выберите ветку для пользователя"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:150
+#: plugins/personal/generic/generic.tpl:152
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2538,67 +2597,69 @@ msgstr "Выберите ветку для пользователя"
 msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Адрес"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Изменить свойства"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2606,7 +2667,7 @@ msgstr "Мобильный"
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
@@ -2644,8 +2705,8 @@ msgstr "Удалить изображение"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2674,7 +2735,7 @@ msgstr "Стандартный сертификат"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:231
+#: plugins/personal/connectivity/class_kolabAccount.inc:226
 #: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
@@ -2709,11 +2770,6 @@ msgstr "Серийный номер сертификата"
 msgid "User settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-#, fuzzy
-msgid "User picture"
-msgstr "Изображение"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 #, fuzzy
 msgid "Clear password"
@@ -2779,6 +2835,7 @@ msgid "Temporary disable FTP access"
 msgstr "Временно отключить доступ к FTP"
 
 #: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/class_proxyAccount.inc:276
 msgid "Proxy account"
 msgstr "Аккаунт Proxy"
 
@@ -2793,6 +2850,7 @@ msgid "Limit proxy access to working time"
 msgstr "Ограничить доступ к прокси рабочим временем"
 
 #: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:289
 msgid "Restrict proxy usage by quota"
 msgstr "Ограничить квотой использование прокси"
 
@@ -2804,16 +2862,39 @@ msgstr "per"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:67
 #, fuzzy, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:110
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:129
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:130
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Настройки Samba"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:139
+#, fuzzy
+msgid "phpgwAccountExpires"
+msgstr "Учетная запись"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:140
+msgid "phpgwAccountStatus"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:141
+#, fuzzy
+msgid "phpgwAccountType"
+msgstr "Учетная запись"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Учетная запись Groupware"
@@ -2831,6 +2912,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/class_kolabAccount.inc:422
 #, fuzzy
 msgid "Delegations"
 msgstr "Назначение"
@@ -2870,10 +2952,12 @@ msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:409
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:112
 #, fuzzy
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
@@ -2881,132 +2965,194 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:120
 #, fuzzy
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:147
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:148
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:149
 #, fuzzy
 msgid "Reject if conflicts"
 msgstr "В"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:150
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 #, fuzzy
 msgid "Manual"
 msgstr "Январь"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:257
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Удалить учетную запись Samba"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:268
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
 #, fuzzy
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:287
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:374
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Моя учетная запись"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:410
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Моя учетная запись"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:419
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:420
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:421
+#, fuzzy
+msgid "Free busy information"
+msgstr "Общая информация о пользователе"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:124
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:63
 #, fuzzy, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:106
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Учетная запись WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:125
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Учетная запись WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:91
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:133
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:136
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:139
 msgid "Value specified as 'Files' is not valid."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Size' is not valid."
 msgstr "Значение поля \"Размер\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Значение поля \"Отношение\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Учетная запись WebDAV"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr ""
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:189
+#, fuzzy
+msgid "Ftp"
+msgstr "Тип"
 
-#: plugins/personal/connectivity/oxchange.tpl:10
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:190
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Создать настройки факса"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
+#, fuzzy
+msgid "Quota files"
+msgstr "Размер квоты"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:200
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Загрузка процессора"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:201
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Размер квоты"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:202
+#, fuzzy
+msgid "Download ratio"
+msgstr "Системная информация"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Пропускная способность (на сервер)"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Пропускная способность (с сервера)"
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:10
 #, fuzzy
 msgid "Open-Xchange account"
 msgstr "Удалить телефонный аккаунт"
@@ -3037,49 +3183,76 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:714
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:811
 #, fuzzy
 msgid "Couldn't connect to postgresql database!"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:718
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:722
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
 #, fuzzy
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "Невозможно выполнить запрос к базе данных журналов!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:731
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:739
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:799
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:839
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Удалить телефонный аккаунт"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:880
+#, fuzzy
+msgid "Open xchange"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:881
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:890
+msgid "OXAppointmentDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:891
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:892
+#, fuzzy
+msgid "mailEnabled"
+msgstr "отключен"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:893
+msgid "OXTimeZone"
+msgstr ""
+
 #: plugins/personal/connectivity/intranet.tpl:3
 #, fuzzy
 msgid "Intranet account"
@@ -3089,97 +3262,148 @@ msgstr "Создать телефонный аккаунт"
 msgid "This account has no connectivity extensions."
 msgstr "В этой учетной записи нет атрибутов для подключения."
 
+#: plugins/personal/connectivity/class_connectivity.inc:173
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Подключение"
+
+#: plugins/personal/connectivity/class_connectivity.inc:181
+#, fuzzy
+msgid "Connectivity  account"
+msgstr "Подключение"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:275
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:74
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "час"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "day"
 msgstr "день"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "week"
 msgstr "неделя"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:75
 msgid "month"
 msgstr "месяц"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:151
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Удалить учетную запись POSIX"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 #, fuzzy
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:257
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Аккаунт Proxy"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:285
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Прокси-сервер"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:288
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Ограничить доступ к прокси рабочим временем"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#, fuzzy
+msgid "Limit quota"
+msgstr "Путь к профилю"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Параметры приложения"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:142
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 #, fuzzy
 msgid "PPTP account"
 msgstr "Аккаунт FTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:95
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:150
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Создать телефонный аккаунт"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:174
+#, fuzzy
+msgid "GOsa intranet account"
+msgstr "Создать телефонный аккаунт"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 #, fuzzy
 msgid "GLPI account"
 msgstr "Аккаунт FTP"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:141
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:79
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:122
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Аккаунт FTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:335
 #, fuzzy
 msgid "Opengroupware"
 msgstr "Учетная запись Groupware"
@@ -3206,6 +3430,7 @@ msgid "Teams"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
 #, fuzzy
 msgid "PHPscheduleit account"
 msgstr "Учетная запись Groupware"
@@ -3215,39 +3440,59 @@ msgstr "Учетная запись Groupware"
 msgid "PHPscheduleit"
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:119
 #, fuzzy, php-format
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Учетная запись Groupware"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:138
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:139
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "Учетная запись Groupware"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:134
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:147
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:336
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:345
+#, fuzzy
+msgid "Open groupware account"
+msgstr "Учетная запись Groupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -3285,7 +3530,7 @@ msgid "Profil quota"
 msgstr "Путь к профилю"
 
 #: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1265
 msgid "Cache profile localy"
 msgstr ""
 
@@ -3295,7 +3540,7 @@ msgid "Kiosk profile settings"
 msgstr "Почтовые настройки пользователя"
 
 #: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1271
 msgid "Kiosk profile"
 msgstr ""
 
@@ -3305,24 +3550,26 @@ msgid "Manage"
 msgstr "Название"
 
 #: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1264
 msgid "Resolution changeable during session"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/class_environment.inc:1266
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Разрешение"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/class_environment.inc:1272
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 #, fuzzy
 msgid "Shares"
 msgstr "сброс"
@@ -3594,26 +3841,30 @@ msgid "Administrator"
 msgstr "Администрирование"
 
 #: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Default printer"
 msgstr "Принтер по умолчанию"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1253
 #, fuzzy
 msgid "Environment settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1260
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1263
 #, fuzzy
 msgid "Profile server"
 msgstr "Сервер для хранения запросов и временных файлов"
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1267
 #, fuzzy
 msgid "Profile quota"
 msgstr "Путь к профилю"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1268
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3667,28 +3918,51 @@ msgstr "Список"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:782
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:271
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3725,7 +3999,7 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3826,36 +4100,43 @@ msgid "Nagios Account"
 msgstr "Контакт"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 #, fuzzy
 msgid "Alias"
 msgstr "женский"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 #, fuzzy
 msgid "Host notification period"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 #, fuzzy
 msgid "Service notification period"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 #, fuzzy
 msgid "Service notification options"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 #, fuzzy
 msgid "Host notification options"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 #, fuzzy
 msgid "Service notification commands"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 #, fuzzy
 msgid "Host notification commands"
 msgstr "Параметры приложения"
@@ -3955,6 +4236,45 @@ msgstr "Введите корректное значение в поле \"Ос
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Системная информация"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Информация об организации"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Системная информация"
+
 #: plugins/personal/nagios/main.inc:124
 #, fuzzy
 msgid "Nagios settings"
@@ -4018,6 +4338,19 @@ msgstr "Создать телефонный аккаунт"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Домашний каталог"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 #, fuzzy
 msgid "Share"
@@ -4025,6 +4358,7 @@ msgstr "сброс"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:274
 msgid "Path"
 msgstr ""
 
@@ -4042,13 +4376,16 @@ msgstr "Выберите ветку стоп-листа"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:272
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -4072,7 +4409,48 @@ msgstr "Блокируемые номера"
 msgid "Numbers can also contain wild cards."
 msgstr "Вместо точных номеров можно использовать шаблоны."
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет отменить результаты этой операции."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+#, fuzzy
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
+"нажмите <i>Отмена</i>."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Управление \"черными списками\""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Стоп-лист номеров (факсы)"
 
@@ -4102,70 +4480,94 @@ msgstr "получение"
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr "Удалить приложения"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Значение поля 'Имя' содержит недопустимые символы."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "Указанное имя уже используется."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, fuzzy, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr "Приложение"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Предупреждение"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Стоп-лист номеров (факсы)"
 
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:781
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Фамилия"
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
 #, fuzzy
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
-"нажмите <i>Отмена</i>."
-
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
+msgid "Blocklist type"
 msgstr "Управление \"черными списками\""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
@@ -4311,12 +4713,12 @@ msgstr "Подразделение"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:357
 msgid "Up"
 msgstr ""
 
@@ -4455,7 +4857,7 @@ msgstr "Показать подразделения"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:359 include/class_acl.inc:397
 #, fuzzy
 msgid "edit"
 msgstr "Изменить"
@@ -4484,7 +4886,7 @@ msgstr "Пользователи домена"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:360 include/class_acl.inc:398
 #, fuzzy
 msgid "delete"
 msgstr "Удалить"
@@ -4501,7 +4903,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Номер факса, для которого сработает GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Язык"
@@ -4512,6 +4916,7 @@ msgstr ""
 "Укаэите предпочтительный язык для получения сообщений о факсах по эл. почте"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Формат доставки"
 
@@ -4537,6 +4942,7 @@ msgid "Deliver fax as mail"
 msgstr "Отправлять факсы по эл. почте"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Отправлять факсы на принтер"
 
@@ -4677,6 +5083,25 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr "Аккаунт Proxy"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Настройки Samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Показать стоп-листы получения"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Показать стоп-листы отправки"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4835,39 +5260,16 @@ msgstr "У вас недостаточно прав для получения и
 msgid "Y-M-D"
 msgstr "Г-М-Д"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Фамилия"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Отчеты о факсах"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Клиентские устройства"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4995,7 +5397,7 @@ msgstr "Город"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Страна"
 
@@ -5747,7 +6149,8 @@ msgid "Notifications"
 msgstr "Специальность"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:163
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Группы"
@@ -5830,12 +6233,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5967,6 +6370,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Группа с таким именем уже существует."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Члены телефонной группы"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Контакт"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Члены группы"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Группа Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 #, fuzzy
 msgid "Release focus"
@@ -5990,7 +6423,8 @@ msgstr "Категория"
 msgid "Available applications"
 msgstr "Доступные приложения"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:496
+#: include/class_acl.inc:559
 msgid "read"
 msgstr "чтение"
 
@@ -6006,7 +6440,8 @@ msgstr "отправка (внешн.)"
 msgid "append"
 msgstr "добавление"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:497
+#: include/class_acl.inc:560
 msgid "write"
 msgstr "запись"
 
@@ -6046,6 +6481,28 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Введите корректный серийный номер"
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Группа"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Альтернативные адреса"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Основной адрес"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:786
+#, fuzzy
+msgid "Permissions"
+msgstr "Права для членов группы"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Администраторы папки"
@@ -6139,18 +6596,6 @@ msgstr "Подразделение"
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Параметры приложения"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Показать адреса подразделения"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Показать подходяшие адреса"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
@@ -6267,6 +6712,40 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Показать приложения"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Приложение"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Приложение"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Параметры приложения"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Показать адреса подразделения"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Показать подходяшие адреса"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 #, fuzzy
 msgid "Group settings"
@@ -6356,14 +6835,6 @@ msgstr "Создать телефонный аккаунт"
 msgid "Posix"
 msgstr "Прокси-сервер"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Приложение"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6485,6 +6956,7 @@ msgstr ""
 
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Шаблон"
 
@@ -6663,7 +7135,9 @@ msgid "Application name"
 msgstr "Приложение"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Отображаемое имя"
 
@@ -6675,6 +7149,7 @@ msgstr ""
 "пиктограммами)"
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6694,7 +7169,9 @@ msgid "Choose subtree to place application in"
 msgstr "Выберите ветку, куда нужно поместить приложение"
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Пиктограмма"
 
@@ -6708,22 +7185,27 @@ msgid "Reload picture from LDAP"
 msgstr "Обновить изображение с LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Разрешено для выполнения только членам группы"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Заменять настройки пользователя при запуске"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Помещать пиктограмму на рабочие столы членов группы"
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 #, fuzzy
 msgid "Place entry in members launch bar"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
@@ -6768,6 +7250,7 @@ msgstr ""
 "его, щелкнув ниже."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Переменная"
 
@@ -6874,6 +7357,20 @@ msgstr "Приложение"
 msgid "Application settings"
 msgstr "Параметры приложения"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Приложение"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Путь к сценариям"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6945,6 +7442,7 @@ msgid "Descriptive text for department"
 msgstr "Описание подразделения"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Категория"
 
@@ -6978,6 +7476,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Основный номер факса для ветки"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 #, fuzzy
 msgid "Administrative settings"
 msgstr "Администрирование"
@@ -6987,10 +7486,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: 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/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -7042,69 +7541,84 @@ msgstr ""
 msgid "Department management"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Показать подразделения"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Обязательное поле \"Описание\" не заполнено."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, fuzzy, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Показать подразделения"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:476
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Объект"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Подразделения"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Телефон"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+#, fuzzy
+msgid "Department name"
+msgstr "Управление подразделениями"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -7120,21 +7634,6 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Телефон"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-#, fuzzy
-msgid "Department name"
-msgstr "Управление подразделениями"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -7188,6 +7687,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -7202,6 +7702,8 @@ msgstr "телефоны"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7274,12 +7776,15 @@ msgid "Terminal Service"
 msgstr "Терминальный сервер"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 #, fuzzy
 msgid "Temporary disable login"
 msgstr "Временно отключить использование факса"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 #, fuzzy
 msgid "Font path"
@@ -7453,8 +7958,11 @@ msgstr "Выберите ветку терминала"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Режим"
 
@@ -7466,7 +7974,9 @@ msgstr "Выберите режим терминала"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Сервер системных журналов"
 
@@ -7477,6 +7987,7 @@ msgid "Choose server to use for logging"
 msgstr "Выберите сервер для ведения системных журналов"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Основной сервер"
 
@@ -7485,6 +7996,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Выберите корневую файловую систему NFS"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Сервер подкачки"
 
@@ -7636,6 +8148,128 @@ msgstr "Пожалуйста, укажите корректную строчну
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Информация об организации"
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "Почтовые настройки"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Разрешение"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Глубина цвета"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "Строчная синхронизация"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "Кадровая синхронизация"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Сервер для хранения запросов и временных файлов"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Выберите модель клавиатуры"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Выберите раскладку"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Выберите вариант раскладки"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "Тип"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Телефонное оборудование"
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, fuzzy, php-format
@@ -7650,6 +8284,29 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr "Почтовые настройки пользователя"
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Ядро для загрузки"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#, fuzzy
+msgid "Kernel paramenter"
+msgstr "Изменить параметры"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Имя сервера"
@@ -7668,6 +8325,7 @@ msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
 
 #: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
 msgid "Workstation name"
 msgstr "Имя рабочий станции"
 
@@ -7699,11 +8357,6 @@ msgstr "URL принтера"
 msgid "Driver"
 msgstr "Драйвер"
 
-#: plugins/admin/systems/printer.tpl:63
-#, fuzzy
-msgid "Permissions"
-msgstr "Права для членов группы"
-
 #: plugins/admin/systems/printer.tpl:70
 #, fuzzy
 msgid "Users which are allowed to use this printer"
@@ -7821,6 +8474,39 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Terminal"
+msgstr "Терминалы"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Действие"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7896,6 +8582,17 @@ msgstr "У вас недостаточно прав для создания по
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "в папку"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Удалить сервис DHCP"
@@ -7952,12 +8649,31 @@ msgstr "Обязательное поле 'Название рабочей ст
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Системы"
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:760
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Сервер NTP"
+
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Системы"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
 msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
 #: plugins/admin/systems/class_systemManagement.inc:236
@@ -8008,20 +8724,6 @@ msgstr "Шаблон рабочей станции для"
 msgid "New System from incoming"
 msgstr "Системная информация"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Terminal"
-msgstr "Терминалы"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Рабочая станция"
-
 #: plugins/admin/systems/class_systemManagement.inc:761
 #, fuzzy
 msgid "Workstation is installing"
@@ -8079,6 +8781,7 @@ msgid "Zones"
 msgstr "телефоны"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 #, fuzzy
 msgid "Postfix mydomain"
 msgstr "в домене"
@@ -8089,26 +8792,31 @@ msgid "Postfix mydestination"
 msgstr "Атрибуты UNIX"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 #, fuzzy
 msgid "POP3 service"
 msgstr "Служба печати"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 #, fuzzy
 msgid "POP3/SSL service"
 msgstr "Служба SSH"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 #, fuzzy
 msgid "IMAP service"
 msgstr "LDAP-сервер"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 #, fuzzy
 msgid "IMAP/SSL service"
 msgstr "Служба SSH"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 #, fuzzy
 msgid "Sieve service"
 msgstr "Служба SSH"
@@ -8126,6 +8834,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 #, fuzzy
 msgid "Quota settings"
 msgstr "Настройки Samba"
@@ -8140,6 +8849,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
@@ -8164,6 +8874,7 @@ msgid "Host used to relay mails"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
@@ -8205,6 +8916,7 @@ msgstr ""
 "ниже."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Ссылки"
@@ -8243,10 +8955,55 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
 msgid "DNS service"
 msgstr "Добавить сервис DNS"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+#, fuzzy
+msgid "DNS"
+msgstr "DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+#, fuzzy
+msgid "Zone name"
+msgstr "Название"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Основной адрес эл. почты для этой общей папки"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "терминалы"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Повторить"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+#, fuzzy
+msgid "Expire"
+msgstr "Экспорт"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone records"
+msgstr "Каталог"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -8259,6 +9016,7 @@ msgstr "Kerberos"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 #, fuzzy
 msgid "Admin user"
 msgstr "Пользователи домена"
@@ -8299,18 +9057,21 @@ msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 #, fuzzy
 msgid "Server identifier"
 msgstr "Номер дома"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 #, fuzzy
 msgid "Connect URL"
 msgstr "Подключение"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 #, fuzzy
 msgid "Sieve port"
 msgstr "Сервер"
@@ -8334,6 +9095,7 @@ msgid "Glpi database"
 msgstr "Базы данных"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 #, fuzzy
 msgid "Database"
@@ -8344,6 +9106,77 @@ msgstr "Базы данных"
 msgid "Machine name"
 msgstr "Название"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Местоположение"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 #, fuzzy
 msgid ""
@@ -8409,6 +9242,39 @@ msgstr "Добавить сервис DNS"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Назначение"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Набор правил"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
 #: plugins/admin/systems/class_printGeneric.inc:103
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
@@ -8532,6 +9398,20 @@ msgstr ""
 msgid "Group"
 msgstr "Группа"
 
+#: plugins/admin/systems/class_printGeneric.inc:773
+#, fuzzy
+msgid "Print generic"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_printGeneric.inc:784
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:785
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Принтер"
+
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
 msgid ""
@@ -8578,6 +9458,64 @@ msgstr "Значение поля \"Имя\" содержит недопусти
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Прочие сетевые компоненты"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Выберите тип системного компонента который желаете создать"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Терминалы и рабочие станцие Linux были созданы автоматически. Поэтому вам "
+"необходимо только создать шаблоны для нужного подразделения. Сервера обычно "
+"добавляются тоже, но в отдельных случаях вам может понадобиться "
+"'виртуальный' сервер для описания обязательных сервисов. Прочие сетевые "
+"компоненты могут быть использованы при установке Nagios для создания "
+"межкомпонентных зависимостей."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Шаблон тонкого клиента Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Шаблон рабочей станции Linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Сервер Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Рабочая станция Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Прочие сетевые компоненты"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Создать"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
 msgid "Time server"
@@ -8589,6 +9527,7 @@ msgid "Printer type"
 msgstr "Имя принтера"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8602,6 +9541,7 @@ msgstr "Имя принтера"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -8611,11 +9551,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "терминалы"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 #, fuzzy
 msgid "Parallel"
@@ -8631,11 +9566,15 @@ msgid "Contacts"
 msgstr "Контакт"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 #, fuzzy
 msgid "Contact person"
 msgstr "Контакт"
@@ -8650,78 +9589,32 @@ msgstr "подразделения"
 msgid "Installed cartridges"
 msgstr "Клиентские устройства"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Выберите тип системного компонента который желаете создать"
+#: plugins/admin/systems/servnfs.tpl:1
+#, fuzzy
+msgid "Edit share"
+msgstr "Пользователи домена"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
-"Терминалы и рабочие станцие Linux были созданы автоматически. Поэтому вам "
-"необходимо только создать шаблоны для нужного подразделения. Сервера обычно "
-"добавляются тоже, но в отдельных случаях вам может понадобиться "
-"'виртуальный' сервер для описания обязательных сервисов. Прочие сетевые "
-"компоненты могут быть использованы при установке Nagios для создания "
-"межкомпонентных зависимостей."
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Шаблон тонкого клиента Linux"
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:276
+#, fuzzy
+msgid "Volume"
+msgstr "Имя системы"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Шаблон рабочей станции Linux"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Сервер Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Рабочая станция Windows"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Сетевой принтер"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Прочие сетевые компоненты"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Создать"
-
-#: plugins/admin/systems/servnfs.tpl:1
-#, fuzzy
-msgid "Edit share"
-msgstr "Пользователи домена"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:25
-#, fuzzy
-msgid "Volume"
-msgstr "Имя системы"
-
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:94
-#, fuzzy
-msgid "Codepage"
-msgstr "Домашняя страница"
+#: plugins/admin/systems/servnfs.tpl:94
+#, fuzzy
+msgid "Codepage"
+msgstr "Домашняя страница"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:275
 #, fuzzy
 msgid "Option"
 msgstr "Параметры"
@@ -8733,11 +9626,13 @@ msgid "System type"
 msgstr "Системы"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 #, fuzzy
 msgid "Operating system"
 msgstr "Удалить"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8842,6 +9737,36 @@ msgstr "У вас недостаточно прав для создания те
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Телефонные номера"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Телефонное оборудование"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+#, fuzzy
+msgid "DTMF mode"
+msgstr "Режим"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "по умолчанию"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8887,6 +9812,20 @@ msgstr "Значение поля \"Имя\" содержит недопусти
 msgid "Option contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
+#: plugins/admin/systems/class_servNfs.inc:262
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:263
+#, fuzzy
+msgid "NFS service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:273
+#, fuzzy
+msgid "Charset"
+msgstr "сброс"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8941,6 +9880,36 @@ msgid ""
 "empty string."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Состояние системы"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Изменить параметры"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+#, fuzzy
+msgid "FAI classes"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Текущий пароль"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
 msgid "Advanced phone settings"
@@ -8966,11 +9935,6 @@ msgstr "Выберите тип мыши"
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-#, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 #, fuzzy
@@ -9116,6 +10080,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 #, fuzzy
 msgid "Section"
 msgstr "Действие"
@@ -9146,6 +10111,7 @@ msgstr "Устройство печати"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Модель"
 
@@ -9196,6 +10162,11 @@ msgstr "Настройки телефона"
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Рабочие станции"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -9246,13 +10217,6 @@ msgstr "Порт"
 msgid "Choose mouse port"
 msgstr "Выберите порт мыши"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Телефонное оборудование"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -9322,11 +10286,6 @@ msgstr "Предоставлять службу сканирования"
 msgid "Boot parameters"
 msgstr "Параметры загрузки"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Ядро для загрузки"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -9356,7 +10315,9 @@ msgstr "LDAP-сервер"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 #, fuzzy
 msgid "Release"
@@ -9417,10 +10378,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "Используйте отладочный режим"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Способ подключения"
@@ -9457,10 +10414,6 @@ msgstr "Выберите, чтобы запустить на терминале
 msgid "Provide print services"
 msgstr "Предоставлять службу печати"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Сервер для хранения запросов и временных файлов"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr "Выберите файловую систему NFS для хранения временных файлов"
@@ -9470,12 +10423,14 @@ msgid "Select scanner driver to use"
 msgstr "Выберите драйвер для используемого сканера"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
 msgid "Repository"
 msgstr "Повторить"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 #, fuzzy
 msgid "Parent server"
 msgstr "Служба печати"
@@ -9505,6 +10460,7 @@ msgstr "Не удается подключиться к базе журнало
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
 msgid "Repository service"
 msgstr "Служба печати"
@@ -9534,6 +10490,15 @@ msgstr "Указанное имя уже используется."
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Набор правил"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
 msgid "List of configured repositories."
@@ -9548,6 +10513,54 @@ msgstr "Повторить"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Название"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "DN администратора"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 #, fuzzy
 msgid "Manage System-types"
@@ -9705,6 +10718,103 @@ msgstr ""
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Device monitor"
+msgstr "Новый пароль"
+
+#: plugins/admin/systems/class_glpiAccount.inc:792
+#, fuzzy
+msgid "Device case"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_glpiAccount.inc:793
+#, fuzzy
+msgid "Device motherboard"
+msgstr "Клавиатура"
+
+#: plugins/admin/systems/class_glpiAccount.inc:794
+#, fuzzy
+msgid "Device soundcard"
+msgstr "Новый пароль"
+
+#: plugins/admin/systems/class_glpiAccount.inc:795
+#, fuzzy
+msgid "Device processor"
+msgstr "Новый пароль"
+
+#: plugins/admin/systems/class_glpiAccount.inc:796
+#, fuzzy
+msgid "Device misc device"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/class_glpiAccount.inc:797
+#, fuzzy
+msgid "Device ram"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_glpiAccount.inc:798
+#, fuzzy
+msgid "Device hard disk drive"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_glpiAccount.inc:799
+#, fuzzy
+msgid "Device drive"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_glpiAccount.inc:800
+#, fuzzy
+msgid "Device controler"
+msgstr "Номер телефона"
+
+#: plugins/admin/systems/class_glpiAccount.inc:801
+msgid "Device graphics card"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:802
+msgid "Device power supply"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:803
+#, fuzzy
+msgid "Device pci device"
+msgstr "Устройство отображения"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
 msgid "Manage manufacturers"
@@ -9748,6 +10858,7 @@ msgstr "Редактиовать объект"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 #, fuzzy
 msgid "Comments"
@@ -9898,6 +11009,7 @@ msgid "Add/Edit network interface"
 msgstr "Сетевой принтер"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 #, fuzzy
 msgid "MAC address"
 msgstr "MAC-адрес"
@@ -10273,6 +11385,31 @@ msgstr ""
 msgid "since"
 msgstr "Работает с"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Почтовые настройки пользователя"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, fuzzy, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -10343,6 +11480,21 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Каталог"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "IP-адрес"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -10380,21 +11532,11 @@ msgstr "Регулярное выражение для поиска адреса
 msgid "Reference"
 msgstr "Ссылки"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-#, fuzzy
-msgid "Zone name"
-msgstr "Название"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
 msgid "Network address"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-#, fuzzy
-msgid "Zone records"
-msgstr "Каталог"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -10413,17 +11555,6 @@ msgstr "Основной адрес эл. почты для этой общей
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Повторить"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-#, fuzzy
-msgid "Expire"
-msgstr "Экспорт"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 #, fuzzy
 msgid "MxRecords"
@@ -10465,7 +11596,7 @@ msgstr "Объект группы"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:358
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
@@ -10835,61 +11966,30 @@ msgstr "Выбрать номера для добавления"
 msgid "All available services are already in use."
 msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-#, fuzzy
-msgid "FAX service"
-msgstr "LDAP-сервер"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-#, fuzzy
-msgid "FAX database configuration"
-msgstr "Базы данных"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
+#: plugins/admin/systems/class_goCupsServer.inc:206
 #, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
-#, fuzzy, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+msgid "Cups"
+msgstr "группы"
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Звук"
 
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:27
@@ -10897,6 +11997,25 @@ msgstr ""
 msgid "LDAP service"
 msgstr "LDAP-сервер"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 #, fuzzy
@@ -10995,36 +12114,100 @@ msgstr "Служба печати"
 msgid "Remove service"
 msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
 #, fuzzy
-msgid "Inventory database"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Start"
+msgstr "Ð\97апÑ\83Ñ\81к"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
+#: plugins/admin/systems/class_serverService.inc:9
 #, fuzzy
-msgid "Glpi management"
-msgstr "Ð\9dазвание"
+msgid "Restart"
+msgstr "Ð\9fовÑ\82оÑ\80иÑ\82Ñ\8c"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Сервер NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:149
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goNtpServer.inc:219
 #, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Сервер подкачки"
+
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
 msgstr ""
@@ -11044,6 +12227,7 @@ msgid "This value specifies the maximal header size."
 msgstr "Группа с таким именем уже существует."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 #, fuzzy
 msgid "Max mailbox size"
 msgstr "Размер квоты"
@@ -11053,6 +12237,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 #, fuzzy
 msgid "Max message size"
 msgstr "Сообщение"
@@ -11062,6 +12247,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 #, fuzzy
 msgid "Relay host"
 msgstr "Набор правил"
@@ -11071,6 +12257,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -11085,6 +12272,7 @@ msgid "Domains and routing"
 msgstr "Администраторы домена"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -11107,6 +12295,7 @@ msgid "Restrictions"
 msgstr "Действие"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 #, fuzzy
 msgid "Restrictions for sender"
 msgstr "Местоположение ветки"
@@ -11118,6 +12307,7 @@ msgid "Restriction filter"
 msgstr "Поиск"
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -11143,142 +12333,37 @@ msgstr "Состояние системы"
 msgid "Set status"
 msgstr "Состояние системы"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-#, fuzzy
-msgid "Start"
-msgstr "Запуск"
-
-#: plugins/admin/systems/class_serverService.inc:9
-#, fuzzy
-msgid "Restart"
-msgstr "Повторить"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Терминальный сервер"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 #, fuzzy
 msgid "Start IMAP service"
 msgstr "LDAP-сервер"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 #, fuzzy
 msgid "Start IMAP SSL service"
 msgstr "Служба SSH"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 #, fuzzy
 msgid "Start POP3 service"
 msgstr "Служба печати"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 #, fuzzy
 msgid "Start POP3 SSL service"
 msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-#, fuzzy
-msgid "Time service"
-msgstr "Сервисы"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
-msgid "NTP service"
-msgstr "Сервер NTP"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-#, fuzzy
-msgid "The given base is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 #, fuzzy
 msgid "Logging service"
 msgstr "Служба печати"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 #, fuzzy
 msgid "Syslog service"
 msgstr "Сервер системных журналов"
@@ -11298,11 +12383,10 @@ msgstr "Атрибуты UNIX"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/class_goSyslogServer.inc:204
 #, fuzzy
-msgid "enabled"
-msgstr "оÑ\82клÑ\8eÑ\87ен"
+msgid "Syslog"
+msgstr "СиÑ\81Ñ\82емнÑ\8bе жÑ\83Ñ\80налÑ\8b"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 #, fuzzy
@@ -11341,6 +12425,26 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Сервер шрифтов"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Каталог"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Учетная запись"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -11356,12 +12460,24 @@ msgstr "Атрибуты UNIX"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
+#: plugins/admin/systems/class_goLogDBServer.inc:215
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Общая информация о пользователе"
+msgid "Log"
+msgstr "Имя пользователя"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "отключен"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 #, fuzzy
 msgid "Kerberos service"
 msgstr "Kerberos"
@@ -11401,10 +12517,10 @@ msgstr "Значение поля \"Файлы\" некорректно."
 msgid "The specified kerberos realm is empty."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
+#: plugins/admin/systems/class_goKrbServer.inc:228
 #, fuzzy
-msgid "FAX database information"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Realm"
+msgstr "Ð\98мÑ\8f Ñ\81еÑ\80веÑ\80а"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 #, fuzzy
@@ -11446,6 +12562,25 @@ msgstr "Укажите корректный номер телефона."
 msgid "Please specify a numeric value for message size limit."
 msgstr "Укажите корректный номер телефона."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Время передачи"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Общая информация о пользователе"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 #, fuzzy
 msgid "IMAP/POP3 service"
@@ -11505,10 +12640,25 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
+#: plugins/admin/systems/class_goImapServer.inc:273
 #, fuzzy
-msgid "Logging database information"
-msgstr "база пользователя"
+msgid "Imap"
+msgstr "Импортировать"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Пароль администратора"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Базы данных"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 #, fuzzy
@@ -11545,6 +12695,21 @@ msgstr "Удалить настройки эл. почты"
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Сканер"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "пользователи"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "база пользователя"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11567,6 +12732,7 @@ msgid "Phone queue"
 msgstr "Номер телефона"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 #, fuzzy
 msgid "System"
 msgstr "Системы"
@@ -11584,6 +12750,11 @@ msgstr ""
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr "Почтовые настройки пользователя"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Состояние системы"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Выберите подразделение"
@@ -11641,6 +12812,7 @@ msgid "Display objects of department"
 msgstr "Показать объекты подразделения"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Объединения"
@@ -11729,6 +12901,16 @@ msgstr "Моя учетная запись"
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Включаемые объекты"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11757,6 +12939,7 @@ msgid "Generic queue Settings"
 msgstr "Общая информация о пользователе"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 #, fuzzy
 msgid "Timeout"
 msgstr "Таймаут (с)"
@@ -11787,6 +12970,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -11840,26 +13024,32 @@ msgid "Phone attributes "
 msgstr "Атрибут DN пользователей"
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -11898,6 +13088,11 @@ msgstr "Моя учетная запись"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Основная группа"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 #, fuzzy
 msgid "ring all"
@@ -12035,6 +13230,70 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr "Почтовые настройки пользователя"
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Члены телефонной группы"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+#, fuzzy
+msgid "Max queue lenght"
+msgstr "Сервер"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+#, fuzzy
+msgid " Announce frequency"
+msgstr "Сообщение автоответчика"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "Сообщение о состоянии"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+msgid "'Second' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Телефонные номера"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Сообщение автоответчика"
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 #, fuzzy
@@ -12247,12 +13506,50 @@ msgstr "Управление приложениями"
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr "Объект группы"
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Путь к сценариям"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, fuzzy, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr "Список подразделений"
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Шаблон"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Шаблон"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Имя сервера"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Права для членов группы"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 #, fuzzy
 msgid "FAI"
 msgstr "Идентификатор факса"
@@ -12294,6 +13591,17 @@ msgstr "Указанное имя уже используется."
 msgid "Specified freeze name is invalid."
 msgstr "Указанное имя уже используется."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Название"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Управление подразделениями"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 #, fuzzy
 msgid "Install method"
@@ -12445,79 +13753,115 @@ msgstr ""
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#, fuzzy
+msgid "Package"
+msgstr "Показать телефоны"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Число страниц"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Почтовые настройки"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 #, fuzzy
 msgid "Template bundle"
 msgstr "Шаблон"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 #, fuzzy
 msgid "Script bundle"
 msgstr "Путь к сценариям"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 #, fuzzy
 msgid "Variable bundle"
 msgstr "Переменная"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 #, fuzzy
 msgid "Partition table"
 msgstr "Переменная"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 #, fuzzy
 msgid "Please enter a valid name."
 msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 #, fuzzy
 msgid "There is already a profile with this class name defined."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+#, fuzzy
+msgid "Profile"
+msgstr "Путь к профилю"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Управление системами"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:475
 #, fuzzy
-msgid "FAI classes"
-msgstr "Выберите тип мыши"
+msgid "FAI hook"
+msgstr "Ошибка LDAP:"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -12535,6 +13879,7 @@ msgid "FS type"
 msgstr "Тип"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 #, fuzzy
 msgid "Mount point"
@@ -12547,6 +13892,7 @@ msgid "Size in MB"
 msgstr "Пользователь:"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 #, fuzzy
 msgid "Mount options"
@@ -12637,6 +13983,7 @@ msgid "Variable attributes"
 msgstr "Атрибут DN пользователей"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 #, fuzzy
 msgid "Variable content"
 msgstr "Переменная"
@@ -12677,6 +14024,41 @@ msgstr "Показать рабочие станции"
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Принтер"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Переменная"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Назначение"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Системы"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Назначение"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "Системная информация"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Назначение"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 #, fuzzy
 msgid "Please enter a value for script."
@@ -12697,10 +14079,6 @@ msgstr "Выберите тип мыши"
 msgid "Hook attributes"
 msgstr "Атрибут DN пользователей"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -12793,6 +14171,11 @@ msgstr "Доступные приложения"
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr "Дополнительные записи в fstab"
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Устройство отображения"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 #, fuzzy
 msgid "no file uploaded yet"
@@ -12849,6 +14232,7 @@ msgid "Destination path"
 msgstr "Назначение"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -12921,11 +14305,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-#, fuzzy
-msgid "Package"
-msgstr "Показать телефоны"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -13227,6 +14606,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "Введите корректный номер телефона!"
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Основная группа"
@@ -13250,6 +14630,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Фильтры"
@@ -13331,11 +14712,27 @@ msgstr "Приложение с таким именем уже существу
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "У вас недостаточно прав для создания принтера в этой ветке."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Тип"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "Тип"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Создать приложения"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Используемые приложения"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -13552,6 +14949,36 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Удалить учетную запись POSIX"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Настройки телефона"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Способ доставки"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Телефон"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voivemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Телефонные номера"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Почтовые настройки пользователя"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13710,6 +15137,20 @@ msgstr "Пожалуйста, укажите корректную кадрову
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr "Создать настройки запись эл. почты"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Управление системами"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Название"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -13847,6 +15288,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "присутствует"
@@ -13857,6 +15299,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Ссылки"
@@ -13866,6 +15309,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -13884,15 +15328,11 @@ msgid "Count users"
 msgstr "Страна"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 #, fuzzy
 msgid "Phone conferences"
 msgstr "Номер телефона"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Название"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13934,6 +15374,48 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Управление подразделениями"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Включить автоответчик"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Страна"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "Порт"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
@@ -13981,6 +15463,9 @@ msgid "Duration"
 msgstr "Продолжительность"
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
@@ -14375,90 +15860,90 @@ msgstr ""
 msgid "References"
 msgstr "Ссылки"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:408
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:591
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:625 include/class_password-methods.inc:181
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:659
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:965
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:972
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:986 include/class_plugin.inc:1015
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1002
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1063 include/class_plugin.inc:1109
+#: include/class_plugin.inc:1110
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Моя учетная запись"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1126 include/class_SnapShotDialog.inc:53
 #, fuzzy
 msgid "You are not allowed to delete this snap shot!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1153
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1185
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1241
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1305 include/class_plugin.inc:1319
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Удалить приложения"
@@ -14467,7 +15952,7 @@ msgstr "Удалить приложения"
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:125
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -14475,13 +15960,13 @@ msgstr ""
 "Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
 "сконвертиуйте его используя скрипт fix_config.sh"
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:139 include/class_pluglist.inc:140
+#: include/class_pluglist.inc:239
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:147 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -14555,7 +16040,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Ошибка XML в gosa.conf: %s в строке %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
@@ -15090,7 +16575,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -15211,121 +16696,121 @@ msgstr ""
 msgid "Access control"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:152
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:153
 #, fuzzy
 msgid "One level"
 msgstr "Уровень информативности"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:154 include/class_acl.inc:159
 #, fuzzy
 msgid "Current object"
 msgstr "Текущий пароль"
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:155
 #, fuzzy
 msgid "Complete subtree"
 msgstr "не полный"
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:156
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:160
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:359
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Изменить"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:360
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Удалить"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:390
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:392
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:397
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Список систем"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:398
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:437
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:481
 #, fuzzy
 msgid "Create objects"
 msgstr "Объект группы"
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:482
 #, fuzzy
 msgid "Move objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:483
 #, fuzzy
 msgid "Remove objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:485 include/class_acl.inc:491
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:488
 #, fuzzy
 msgid "Move object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "Remove object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:588
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:628
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:689
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:697
 #, fuzzy
 msgid "Members:"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:703
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:811
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Атрибуты UNIX"
@@ -15427,56 +16912,56 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Удалить"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
 
-#: html/index.php:134
+#: html/index.php:142
 #, fuzzy, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:285
+#: html/index.php:293
 #, fuzzy
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15806,10 +17291,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN администратора"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Пароль администратора"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -16111,8 +17592,31 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Размер квоты"
+#~ msgid "Day"
+#~ msgstr "день"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Выберите модель клавиатуры"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Выберите вариант раскладки"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Имя системы"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Номер дома"
+
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Стандартный сертификат"
 
 #, fuzzy
 #~ msgid "Vocation message"
@@ -16289,10 +17793,6 @@ msgstr ""
 #~ "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 #~ "ниже."
 
-#, fuzzy
-#~ msgid "Add Kolab service"
-#~ msgstr "Добавить сервис DNS"
-
 #, fuzzy
 #~ msgid ""
 #~ "This server has kolab features disabled. You can enable them by clicking "
@@ -16365,10 +17865,6 @@ msgstr ""
 #~ msgid "New Entry"
 #~ msgstr "Принтер"
 
-#, fuzzy
-#~ msgid "Admin"
-#~ msgstr "DN администратора"
-
 #, fuzzy
 #~ msgid "Admin Toggle"
 #~ msgstr "Пользователи домена"
@@ -16381,10 +17877,6 @@ msgstr ""
 #~ "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
 #~ "атрибуты POSIX, включите сначала их использование."
 
-#, fuzzy
-#~ msgid "OpenXchange"
-#~ msgstr "Удалить телефонный аккаунт"
-
 #, fuzzy
 #~ msgid ""
 #~ "This account has %s features disabled. Mail features are needed for "
@@ -16499,13 +17991,6 @@ msgstr ""
 #~ msgid "Thin Clients"
 #~ msgstr "Тонкие клиенты"
 
-#~ msgid "Workstations"
-#~ msgstr "Рабочие станции"
-
-#, fuzzy
-#~ msgid "Profile"
-#~ msgstr "Путь к профилю"
-
 #, fuzzy
 #~ msgid "Groupname"
 #~ msgstr "Группа"
@@ -16592,10 +18077,6 @@ msgstr ""
 #~ msgid "Add inventory service"
 #~ msgstr "Добавить сервис DNS"
 
-#, fuzzy
-#~ msgid "Monitor"
-#~ msgstr "Мониторинг"
-
 #, fuzzy
 #~ msgid "Other devices"
 #~ msgstr "Сетевые устройства"
@@ -16624,10 +18105,6 @@ msgstr ""
 #~ msgid "DNS-Zone"
 #~ msgstr "нет"
 
-#, fuzzy
-#~ msgid "DNS-TTL"
-#~ msgstr "DNS"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Выбрать"
@@ -16840,10 +18317,6 @@ msgstr ""
 #~ msgid "pager"
 #~ msgstr "Пейджер"
 
-#, fuzzy
-#~ msgid "Nagios Auth"
-#~ msgstr "Контакт"
-
 #, fuzzy
 #~ msgid "authorized_for_system_information"
 #~ msgstr "Системная информация"
@@ -16923,10 +18396,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Укажите дополнительные файловые системы для монтирования во время загрузки"
 
-#, fuzzy
-#~ msgid "Service"
-#~ msgstr "Сервисы"
-
 #, fuzzy
 #~ msgid "List of used class names"
 #~ msgstr "Выберите тип мыши"
@@ -17007,10 +18476,6 @@ msgstr ""
 #~ msgid "Delete object"
 #~ msgstr "Включаемые объекты"
 
-#, fuzzy
-#~ msgid "Script set"
-#~ msgstr "Путь к сценариям"
-
 #, fuzzy
 #~ msgid "Variable set"
 #~ msgstr "Переменная"

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index a0909decbfa956519535fbf085373471d7adb01d..fc967d3b14a8755f5dfe23200f99d65b4c975c53 100644 (file)
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -774,7 +774,7 @@ class glpiAccount extends plugin
           "plCategory"    => array("workstation","terminal","component","server","phone") ,
           "plProvidedAcls"=> array(
           
-            "tech_num"            => _("Technical responsilbe"),
+            "tech_num"            => _("Technical responsible"),
             "comments"            => _("Comment"),
             "os"                  => _("Operating system"),
             "location"            => _("Location"),

diff --git a/plugins/admin/systems/class_goImapServer.inc b/plugins/admin/systems/class_goImapServer.inc
index cb1efe06f285bff196e500fa06cbf78ac4e55803..fa4108f8027524daa4e06f727837fac80bfc8dc4 100644 (file)
--- a/plugins/admin/systems/class_goImapServer.inc
+++ b/plugins/admin/systems/class_goImapServer.inc
@@ -279,7 +279,7 @@ class goImapServer extends plugin{
           "plCategory"    => array("server"),
 
           "plProvidedAcls"=> array(
-            "goImapName"        =>_("Server indentifier"),
+            "goImapName"        =>_("Server identifier"),
             "goImapConnect"     =>_("Connect URL"),
             "goImapAdmin"       =>_("Admin user"),
             "goImapPassword"    =>_("Admin password"),

diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/class_servNfs.inc
index 113675920841129b34ff9b74a275b11f87138f09..c695e4b632acfce004c42ce19bf3407db1d5e799 100644 (file)
--- a/plugins/admin/systems/class_servNfs.inc
+++ b/plugins/admin/systems/class_servNfs.inc
@@ -273,7 +273,7 @@ class servnfs extends plugin
               "charset"     => _("Charset"),
               "path"        => _("Path"),
               "option"      => _("Option"), 
-              "volume"      => _("Valume"))
+              "volume"      => _("Volume"))
             ));
   }
 }

diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index b5f15380a04e0b6d94f714d27a5d252f3df6a613..43cf9b1a79e6997e22f7516340ca1d31f85b3b66 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -443,12 +443,12 @@ class termservice extends plugin
             "gotoLpdEnable"           => _("Printer service enabled"),
             "gotoLpdServer"           => _("Spool server"),
             "gotoScannerEnable"       => _("Scanner enabled"),
-            "gotoScannerModel"        => _("Scanner modell"),
+            "gotoScannerModel"        => _("Scanner model"),
             "gotoScannerClients"      => _(""),
             "gotoScannerBackend"      => _(""),
-            "gotoXKbModel"            => _("Keyboard modell"),
+            "gotoXKbModel"            => _("Keyboard model"),
             "gotoXKbLayout"           => _("Keyboard layout"),
-            "gotoXKbVariant"          => _("Keyborad variant"),
+            "gotoXKbVariant"          => _("Keyboard variant"),
             "gotoXMouseType"          => _("Mouse type"),
             "gotoXMouseport"          => _("Mouse port"),
             "goFonHardware"           => _("Telephone hardware"))